From 17ac8091594271f0dab9ae014f2d4a720931f199 Mon Sep 17 00:00:00 2001 From: Roy Hopkins Date: Wed, 3 Jan 2024 15:29:50 +0000 Subject: [PATCH] igvm: Remove unused firmware metadata base address from IGVM params Following the changes to SVSM that mean the firmware configuration is always completely described by the IGVM parameter block, this commit removes the now unused 'metadata' field that previously defined the location of the OVMF metadata page in guest memory. Signed-off-by: Roy Hopkins --- bootlib/src/igvm_params.rs | 7 +------ igvmbld/igvm_defs.h | 4 ++-- igvmbld/igvmbld.c | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bootlib/src/igvm_params.rs b/bootlib/src/igvm_params.rs index 447c3e6a64..bcc9b7e9aa 100644 --- a/bootlib/src/igvm_params.rs +++ b/bootlib/src/igvm_params.rs @@ -48,12 +48,7 @@ pub struct IgvmParamBlockFwInfo { /// no firmware is launched after initialization is complete. pub size: u32, - /// The guest physical address of the page that contains metadata that - /// corresponds to the firmware. The SVSM expects the page to contain - /// metadata in the format defined by OVMF. If this field is zero but - /// a firmware range has been provided then the firmware is launched - /// without parsing any metadata. - pub metadata: u32, + _reserved: u32, /// The guest physical address at which the firmware expects to find the /// secrets page. diff --git a/igvmbld/igvm_defs.h b/igvmbld/igvm_defs.h index edb254cd94..4b6e848869 100644 --- a/igvmbld/igvm_defs.h +++ b/igvmbld/igvm_defs.h @@ -106,7 +106,7 @@ typedef struct { typedef struct { uint32_t start; uint32_t size; - uint32_t metadata; + uint32_t _reserved; uint32_t secrets_page; uint32_t caa_page; uint32_t cpuid_page; @@ -122,7 +122,7 @@ typedef struct { uint32_t cpuid_page; uint32_t secrets_page; uint16_t debug_serial_port; - uint16_t _reserved1; + uint16_t _reserved; IgvmParamBlockFwInfo firmware; uint32_t kernel_reserved_size; uint32_t kernel_size; diff --git a/igvmbld/igvmbld.c b/igvmbld/igvmbld.c index 3d8647bf20..ed99693730 100644 --- a/igvmbld/igvmbld.c +++ b/igvmbld/igvmbld.c @@ -910,7 +910,6 @@ static void print_fw_metadata(IgvmParamBlock *igvm_parameter_block) printf("Firmware configuration\n======================\n"); printf(" start: %X\n", igvm_parameter_block->firmware.start); printf(" size: %X\n", igvm_parameter_block->firmware.size); - printf(" metadata: %X\n", igvm_parameter_block->firmware.metadata); printf(" secrets_page: %X\n", igvm_parameter_block->firmware.secrets_page); printf(" caa_page: %X\n", igvm_parameter_block->firmware.caa_page); printf(" cpuid_page: %X\n", igvm_parameter_block->firmware.cpuid_page);