diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2019-02-15 15:36:00 +0000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-02-22 10:51:31 -0500 |
| commit | b81a5f9427270133c27ab660c0054b277b2728d7 (patch) | |
| tree | 19c324086fce10cdd4590e5f12cfae3733ffbe8e | |
| parent | ee1cd0099ab04f748c6d839e4f4d9a41b21e7399 (diff) | |
| download | focaccia-qemu-b81a5f9427270133c27ab660c0054b277b2728d7.tar.gz focaccia-qemu-b81a5f9427270133c27ab660c0054b277b2728d7.zip | |
hw/smbios: fix offset of type 3 sku field
The type 3 SMBIOS structure[1] ends with fields ... 0x14 - contained element count 0x15 - contained element record length 0x16 - sku number The smbios_type_3 struct missed the contained element record length field, causing sku number to be reported at the wrong offset. [1] https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.1.1.pdf Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20190215153600.1770727-1-berrange@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Fixes: e41fca3da72 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/smbios/smbios.c | 1 | ||||
| -rw-r--r-- | include/hw/firmware/smbios.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 818be8a838..47be9071fa 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -563,6 +563,7 @@ static void smbios_build_type_3_table(void) t->height = 0; t->number_of_power_cords = 0; t->contained_element_count = 0; + t->contained_element_record_length = 0; SMBIOS_TABLE_SET_STR(3, sku_number_str, type3.sku); SMBIOS_BUILD_TABLE_POST; diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h index eeb5a4d7b6..6fef32a3c9 100644 --- a/include/hw/firmware/smbios.h +++ b/include/hw/firmware/smbios.h @@ -162,6 +162,7 @@ struct smbios_type_3 { uint8_t height; uint8_t number_of_power_cords; uint8_t contained_element_count; + uint8_t contained_element_record_length; uint8_t sku_number_str; /* contained elements follow */ } QEMU_PACKED; |