From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYe3y-0000yN-Q1 for qemu-devel@nongnu.org; Fri, 11 Apr 2014 12:12:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYe3s-0006KP-8j for qemu-devel@nongnu.org; Fri, 11 Apr 2014 12:12:22 -0400 Received: from mail-qa0-x22c.google.com ([2607:f8b0:400d:c00::22c]:38852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYe3s-0006KI-54 for qemu-devel@nongnu.org; Fri, 11 Apr 2014 12:12:16 -0400 Received: by mail-qa0-f44.google.com with SMTP id hw13so5416597qab.17 for ; Fri, 11 Apr 2014 09:12:15 -0700 (PDT) From: "Gabriel L. Somlo" Date: Fri, 11 Apr 2014 12:11:55 -0400 Message-Id: <1397232718-15282-16-git-send-email-somlo@cmu.edu> In-Reply-To: <1397232718-15282-1-git-send-email-somlo@cmu.edu> References: <1397232718-15282-1-git-send-email-somlo@cmu.edu> Subject: [Qemu-devel] [QEMU v5 PATCH 15/18] SMBIOS: Update type 3 definition to smbios spec v2.7 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kevin@koconnor.net, seabios@seabios.org, lersek@redhat.com, kraxel@redhat.com, agraf@suse.de Signed-off-by: Gabriel Somlo --- hw/i386/smbios.c | 8 +++++++- include/hw/i386/smbios.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index b98d7ba..f5507cb 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -64,7 +64,7 @@ static struct { } type2; static struct { - const char *manufacturer, *version, *serial, *asset; + const char *manufacturer, *version, *serial, *asset, *sku; } type3; static struct { @@ -212,6 +212,10 @@ static const QemuOptDesc qemu_smbios_type3_opts[] = { .name = "asset", .type = QEMU_OPT_STRING, .help = "asset tag number", + },{ + .name = "sku", + .type = QEMU_OPT_STRING, + .help = "SKU number", }, { /* end of list */ } }; @@ -472,6 +476,7 @@ static void smbios_build_type_3_table(void) t->height = 0; t->number_of_power_cords = 0; t->contained_element_count = 0; + SMBIOS_TABLE_SET_STR(3, sku_number_str, type3.sku); SMBIOS_BUILD_TABLE_POST; } @@ -834,6 +839,7 @@ void smbios_entry_add(QemuOpts *opts) save_opt(&type3.version, opts, "version"); save_opt(&type3.serial, opts, "serial"); save_opt(&type3.asset, opts, "asset"); + save_opt(&type3.sku, opts, "sku"); return; case 4: qemu_opts_validate(opts, qemu_smbios_type4_opts, &local_err); diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index 80e91b4..ce2f0f2 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -79,7 +79,7 @@ struct smbios_type_2 { /* contained elements follow */ } QEMU_PACKED; -/* SMBIOS type 3 - System Enclosure (v2.3) */ +/* SMBIOS type 3 - System Enclosure (v2.7) */ struct smbios_type_3 { struct smbios_structure_header header; uint8_t manufacturer_str; @@ -95,6 +95,7 @@ struct smbios_type_3 { uint8_t height; uint8_t number_of_power_cords; uint8_t contained_element_count; + uint8_t sku_number_str; /* contained elements follow */ } QEMU_PACKED; -- 1.9.0