Add assertion in pc_system_ovmf_table_find that verifies that the flash
was indeed previously parsed (looking for the OVMF table) by
pc_system_parse_ovmf_flash.
Now pc_system_ovmf_table_find distinguishes between "no one called
pc_system_parse_ovmf_flash" (which will abort due to assertion failure)
and "the flash was parsed but no OVMF table was found, or it is invalid"
(which will return false).
Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <
20210701052749.934744-2-dovmurik@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
#define OVMF_TABLE_FOOTER_GUID "96b582de-1fb2-45f7-baea-a366c55a082d"
+static bool ovmf_flash_parsed;
static uint8_t *ovmf_table;
static int ovmf_table_len;
int tot_len;
/* should only be called once */
- if (ovmf_table) {
+ if (ovmf_flash_parsed) {
return;
}
+ ovmf_flash_parsed = true;
+
if (flash_size < TARGET_PAGE_SIZE) {
return;
}
int tot_len = ovmf_table_len;
QemuUUID entry_guid;
+ assert(ovmf_flash_parsed);
+
if (qemu_uuid_parse(entry, &entry_guid) < 0) {
return false;
}