bios: Fix multiple calls into smbios_load_external()
PATCH RESEND 1/1 bios: Fix multiple calls into smbios_load_external()
We're marking the used entry bitmap in smbios_load_external() for each type we check, regardless of whether we loaded anything. This makes subsequent calls behave as if we've already loaded the tables from qemu and can result in missing tables (ex. multiple type4 entries on an SMP guest). Only mark the bitmap if we actually load something.
--
bios/rombios32.c +6 -5
@@ -2554,13 +2554,14 @@ smbios_load_external(int type, char **p, unsigned *nr_structs, *max_struct_size = *p - (char *)header; } -/* Mark that we've reported on this type */ - used_bitmap[(type >>6 ) &0x3 ] |= (1ULL << (type &0x3f )); +if (start != *p) { +/* Mark that we've reported on this type */ + used_bitmap[(type >>6 ) &0x3 ] |= (1ULL << (type &0x3f )); +return 1 ; + } -return (start != *p); -#else /* !BX_QEMU */ +#endif /* !BX_QEMU */ return 0 ; -#endif }void smbios_init (void )
Bump.
Quoted 38 lines · Alex Williamson
We're marking the used entry bitmap in
smbios_load_external()for each type we check, regardless of whether we loaded anything. This makes subsequent calls behave as if we've already loaded the tables from qemu and can result in missing tables (ex. multiple type4 entries on an SMP guest). Only mark the bitmap if we actually load something.Signed-off-by Alex Williamson <[email protected]>--
bios/rombios32.c +6
-5@@ -2554,13 +2554,14 @@ smbios_load_external(int type, char **p, unsigned *nr_structs, *max_struct_size = *p - (char *)header; } - /* Mark that we've reported on this type */ - used_bitmap[(type >> 6) & 0x3] |= (1ULL << (type & 0x3f)); + if (start != *p) { + /* Mark that we've reported on this type */ + used_bitmap[(type >> 6) & 0x3] |= (1ULL << (type & 0x3f)); + return 1; + } - return (start != *p); -#else /* !BX_QEMU */ +#endif /* !BX_QEMU */ return 0; -#endif } void smbios_init(void)