diff options
| author | Heinrich Schuchardt | 2023-01-05 18:26:01 +0100 |
|---|---|---|
| committer | Heinrich Schuchardt | 2023-01-06 22:27:30 +0100 |
| commit | eff444019545642a844431692dd51829aa52528c (patch) | |
| tree | e52a108d870a0313f4f24a7f2f6a9e4acdfcfcdf /cmd | |
| parent | f4af97cdb4b9d702bf7d76d896e3b6d13a162bb3 (diff) | |
efi_loader: carve out efi_get_memory_map_alloc()
Carve out code from efidebug command used to read the memory map.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/efidebug.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 569003ae2ef..e6959ede930 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -591,25 +591,15 @@ static void print_memory_attributes(u64 attributes) static int do_efi_show_memmap(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct efi_mem_desc *memmap = NULL, *map; - efi_uintn_t map_size = 0; + struct efi_mem_desc *memmap, *map; + efi_uintn_t map_size; const char *type; int i; efi_status_t ret; - ret = efi_get_memory_map(&map_size, memmap, NULL, NULL, NULL); - if (ret == EFI_BUFFER_TOO_SMALL) { - map_size += sizeof(struct efi_mem_desc); /* for my own */ - ret = efi_allocate_pool(EFI_BOOT_SERVICES_DATA, map_size, - (void *)&memmap); - if (ret != EFI_SUCCESS) - return CMD_RET_FAILURE; - ret = efi_get_memory_map(&map_size, memmap, NULL, NULL, NULL); - } - if (ret != EFI_SUCCESS) { - efi_free_pool(memmap); + ret = efi_get_memory_map_alloc(&map_size, &memmap); + if (ret != EFI_SUCCESS) return CMD_RET_FAILURE; - } printf("Type Start%.*s End%.*s Attributes\n", EFI_PHYS_ADDR_WIDTH - 5, spc, EFI_PHYS_ADDR_WIDTH - 3, spc); |