From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOT9-0005Pg-N0 for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:19:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNOT4-0007Ea-0E for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:19:51 -0400 Received: from mail-qa0-x234.google.com ([2607:f8b0:400d:c00::234]:53989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOT3-0007EU-SH for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:19:45 -0400 Received: by mail-qa0-f52.google.com with SMTP id m5so8373961qaj.25 for ; Tue, 11 Mar 2014 08:19:45 -0700 (PDT) From: "Gabriel L. Somlo" Date: Tue, 11 Mar 2014 11:16:17 -0400 Message-Id: <1394550989-693-2-git-send-email-somlo@cmu.edu> In-Reply-To: <1394550989-693-1-git-send-email-somlo@cmu.edu> References: <1394532186.22422.24.camel@nilsson.home.kraxel.org> <1394550989-693-1-git-send-email-somlo@cmu.edu> Subject: [Qemu-devel] [v2 PATCH 01/13] SMBIOS: Update all table definitions to smbios spec v2.3 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, gsomlo@gmail.com, armbru@redhat.com, alex.williamson@redhat.com, kevin@koconnor.net, kraxel@redhat.com, lersek@redhat.com From: "Gabriel L. Somlo" Table definitions for types 4 and 17 are only up to v2.0, so add fields specified in smbios v2.3, as expected (and advertised) by the SeaBIOS smbios entry point structure. Signed-off-by: Gabriel Somlo --- include/hw/i386/smbios.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index 18fb970..de1da87 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -79,7 +79,7 @@ struct smbios_type_3 { // contained elements follow } QEMU_PACKED; -/* SMBIOS type 4 - Processor Information (v2.0) */ +/* SMBIOS type 4 - Processor Information (v2.3) */ struct smbios_type_4 { struct smbios_structure_header header; uint8_t socket_designation_str; @@ -97,6 +97,10 @@ struct smbios_type_4 { uint16_t l1_cache_handle; uint16_t l2_cache_handle; uint16_t l3_cache_handle; + uint8_t serial_number_str; + uint8_t asset_tag_number_str; + uint8_t part_number_str; + } QEMU_PACKED; /* SMBIOS type 16 - Physical Memory Array @@ -111,7 +115,7 @@ struct smbios_type_16 { uint16_t memory_error_information_handle; uint16_t number_of_memory_devices; } QEMU_PACKED; -/* SMBIOS type 17 - Memory Device +/* SMBIOS type 17 - Memory Device (v2.3) * Associated with one type 19 */ struct smbios_type_17 { @@ -127,6 +131,11 @@ struct smbios_type_17 { uint8_t bank_locator_str; uint8_t memory_type; uint16_t type_detail; + uint16_t speed; + uint8_t manufacturer_str; + uint8_t serial_number_str; + uint8_t asset_tag_number_str; + uint8_t part_number_str; } QEMU_PACKED; /* SMBIOS type 19 - Memory Array Mapped Address */ -- 1.8.1.4