Commit b81a5f94 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Michael S. Tsirkin
Browse files

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: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190215153600.1770727-1-berrange@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Fixes: e41fca3d
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ee1cd009

hw/smbios/smbios.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

include/hw/firmware/smbios.h

+1 −0
Original line number Diff line number Diff line
@@ -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;