From patchwork Tue Mar 11 15:16:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel L. Somlo" X-Patchwork-Id: 329127 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DFB642C009A for ; Wed, 12 Mar 2014 02:23:52 +1100 (EST) Received: from localhost ([::1]:55751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOX0-0001Vo-Ds for incoming@patchwork.ozlabs.org; Tue, 11 Mar 2014 11:23:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOTK-0005dT-6Q for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNOTD-0007H8-FO for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:20:02 -0400 Received: from mail-qg0-x22e.google.com ([2607:f8b0:400d:c04::22e]:48817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOTD-0007Gp-9y for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:19:55 -0400 Received: by mail-qg0-f46.google.com with SMTP id e89so5253221qgf.5 for ; Tue, 11 Mar 2014 08:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8Ct67ZscSZbV2VzkR9c9d6QSpQFLXWgSiuxfQVYXq7Y=; b=QyrLGIPjb+uz9A2L3U1uwLUcaz3SY5SgPLWfNb7hbLXM+Pqhh/QOvw44X4rECqNW/T fr911plHbvGo+oEnvMe+tr+aZupnjEJtlW6oCK+C8ZhkofZ93a++qRUvqtLJ3K1o9LXJ 1SSubvJ+PAd4cedgasjcwRHmU25EYZOltCnReUsCZ7aJ+9zLFGOJfyugHh8p4RW21Kl1 lX3CPr5BVLrr5Me8QCerS9Eu6oBG2BdyNF0pChf0WffbGoflekTUj4d3JEgOW5g71W8U V5aeFlt9NHt89N2q12Cqh3QVL/vDNvyFbKpNfLHB8013Mv1vBsm2z3G3abLWrtDYpobZ wFag== X-Received: by 10.140.84.40 with SMTP id k37mr2777471qgd.98.1394551194838; Tue, 11 Mar 2014 08:19:54 -0700 (PDT) Received: from ERROL.ini.cmu.edu (ERROL.INI.CMU.EDU. [128.2.16.43]) by mx.google.com with ESMTPSA id m14sm68900013qax.9.2014.03.11.08.19.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2014 08:19:54 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Tue, 11 Mar 2014 11:16:24 -0400 Message-Id: <1394550989-693-9-git-send-email-somlo@cmu.edu> X-Mailer: git-send-email 1.8.1.4 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> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22e Cc: agraf@suse.de, gsomlo@gmail.com, armbru@redhat.com, alex.williamson@redhat.com, kevin@koconnor.net, kraxel@redhat.com, lersek@redhat.com Subject: [Qemu-devel] [v2 PATCH 08/13] SMBIOS: Build full type 3 table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Gabriel L. Somlo" Build smbios type 3 (system enclosure) table, and make it available to the bios via fw_cfg. Signed-off-by: Gabriel Somlo --- hw/i386/smbios.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index 16d400a..c1c0513 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -61,6 +61,10 @@ static struct { const char *manufacturer, *product, *version, *serial, *asset, *location; } type2; +static struct { + const char *manufacturer, *version, *serial, *asset; +} type3; + static QemuOptsList qemu_smbios_opts = { .name = "smbios", .head = QTAILQ_HEAD_INITIALIZER(qemu_smbios_opts.head), @@ -177,6 +181,31 @@ static const QemuOptDesc qemu_smbios_type2_opts[] = { { /* end of list */ } }; +static const QemuOptDesc qemu_smbios_type3_opts[] = { + { + .name = "type", + .type = QEMU_OPT_NUMBER, + .help = "SMBIOS element type", + },{ + .name = "manufacturer", + .type = QEMU_OPT_STRING, + .help = "manufacturer name", + },{ + .name = "version", + .type = QEMU_OPT_STRING, + .help = "version number", + },{ + .name = "serial", + .type = QEMU_OPT_STRING, + .help = "serial number", + },{ + .name = "asset", + .type = QEMU_OPT_STRING, + .help = "asset tag number", + }, + { /* end of list */ } +}; + static void smbios_register_config(void) { qemu_add_opts(&qemu_smbios_opts); @@ -350,6 +379,27 @@ static void smbios_build_type_2_table(void) SMBIOS_BUILD_TABLE_POST; } +static void smbios_build_type_3_table(void) +{ + SMBIOS_BUILD_TABLE_PRE(3, 0x300, true); /* required */ + + SMBIOS_TABLE_SET_STR(3, manufacturer_str, type3.manufacturer); + t->type = 0x01; /* Other */ + SMBIOS_TABLE_SET_STR(3, version_str, type3.version); + SMBIOS_TABLE_SET_STR(3, serial_number_str, type3.serial); + SMBIOS_TABLE_SET_STR(3, asset_tag_number_str, type3.asset); + t->boot_up_state = 0x03; /* Safe */ + t->power_supply_state = 0x03; /* Safe */ + t->thermal_state = 0x03; /* Safe */ + t->security_status = 0x02; /* Unknown */ + t->oem_defined = 0; + t->height = 0; + t->number_of_power_cords = 0; + t->contained_element_count = 0; + + SMBIOS_BUILD_TABLE_POST; +} + #define SMBIOS_SET_DEFAULT(field, value) \ if (!field) { \ field = value; \ @@ -368,6 +418,8 @@ void smbios_set_defaults(const char *manufacturer, SMBIOS_SET_DEFAULT(type2.manufacturer, manufacturer); SMBIOS_SET_DEFAULT(type2.product, product); SMBIOS_SET_DEFAULT(type2.version, version); + SMBIOS_SET_DEFAULT(type3.manufacturer, manufacturer); + SMBIOS_SET_DEFAULT(type3.version, version); } uint8_t *smbios_get_table(size_t *length) @@ -376,6 +428,7 @@ uint8_t *smbios_get_table(size_t *length) smbios_build_type_0_table(); smbios_build_type_1_table(); smbios_build_type_2_table(); + smbios_build_type_3_table(); smbios_validate_table(); smbios_immutable = true; } @@ -522,6 +575,17 @@ void smbios_entry_add(QemuOpts *opts) save_opt(&type2.asset, opts, "asset"); save_opt(&type2.location, opts, "location"); return; + case 3: + qemu_opts_validate(opts, qemu_smbios_type3_opts, &local_err); + if (local_err) { + error_report("%s", error_get_pretty(local_err)); + exit(1); + } + save_opt(&type3.manufacturer, opts, "manufacturer"); + save_opt(&type3.version, opts, "version"); + save_opt(&type3.serial, opts, "serial"); + save_opt(&type3.asset, opts, "asset"); + return; default: error_report("Don't know how to build fields for SMBIOS type %ld", type);