Skip to content

Commit

Permalink
igvm: Remove unused firmware metadata base address from IGVM params
Browse files Browse the repository at this point in the history
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 <roy.hopkins@suse.com>
  • Loading branch information
roy-hopkins committed Jan 4, 2024
1 parent b5c8207 commit 17ac809
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
7 changes: 1 addition & 6 deletions bootlib/src/igvm_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions igvmbld/igvm_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
1 change: 0 additions & 1 deletion igvmbld/igvmbld.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 17ac809

Please sign in to comment.