From patchwork Wed Jul 17 17:16:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 259731 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C43D2C00B1 for ; Thu, 18 Jul 2013 03:21:14 +1000 (EST) Received: from localhost ([::1]:45474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzVPc-0008Si-4k for incoming@patchwork.ozlabs.org; Wed, 17 Jul 2013 13:21:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzVKs-0001VJ-Fc for qemu-devel@nongnu.org; Wed, 17 Jul 2013 13:16:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzVKo-0007ZU-Ap for qemu-devel@nongnu.org; Wed, 17 Jul 2013 13:16:18 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:36266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzVKn-0007Yq-Qn for qemu-devel@nongnu.org; Wed, 17 Jul 2013 13:16:14 -0400 Received: from blackfin.pond.sub.org (p5B32AB31.dip0.t-ipconnect.de [91.50.171.49]) by oxygen.pond.sub.org (Postfix) with ESMTPA id E15549FE60; Wed, 17 Jul 2013 19:16:10 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BB806200BB; Wed, 17 Jul 2013 19:16:09 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2013 19:16:06 +0200 Message-Id: <1374081369-1511-5-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1374081369-1511-1-git-send-email-armbru@redhat.com> References: <1374081369-1511-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: aliguori@us.ibm.com, lersek@redhat.com, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 4/7] smbios: Make multiple -smbios type= accumulate sanely 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 Currently, -smbios type=T,NAME=VAL,... adds one field (T,NAME) with value VAL to fw_cfg for each unique NAME. If NAME occurs multiple times, the last one's VAL is used (before the QemuOpts conversion, the first one was used). Multiple -smbios can add multiple fields with the same (T, NAME). SeaBIOS reads all of them from fw_cfg, but uses only the first field (T, NAME). The others are ignored. "First one wins, subsequent ones get ignored silently" isn't nice. We commonly let the last option win. Useful, because it lets you -readconfig first, then selectively override with command line options. Clean up -smbios to work the common way. Accumulate the settings, with later ones overwriting earlier ones. Put the result into fw_cfg (no more useless duplicates). Bonus cleanup: qemu_uuid_parse() no longer sets SMBIOS system uuid by side effect. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- arch_init.c | 3 - hw/i386/smbios.c | 152 ++++++++++++++++++++++++++++------------------- include/hw/i386/smbios.h | 1 - include/sysemu/sysemu.h | 1 + vl.c | 2 + 5 files changed, 94 insertions(+), 65 deletions(-) diff --git a/arch_init.c b/arch_init.c index 5930935..8ea6fba 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1072,9 +1072,6 @@ int qemu_uuid_parse(const char *str, uint8_t *uuid) if (ret != 16) { return -1; } -#ifdef TARGET_I386 - smbios_add_field(1, offsetof(struct smbios_type_1, uuid), uuid, 16); -#endif return 0; } diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index 7908c47..fb1b27b 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -47,6 +47,7 @@ struct smbios_table { static uint8_t *smbios_entries; static size_t smbios_entries_len; static int smbios_type4_count = 0; +static bool smbios_immutable; static struct { bool seen; @@ -54,6 +55,17 @@ static struct { Location loc; } first_opt[2]; +static struct { + const char *vendor, *version, *date; + bool have_major_minor; + uint8_t major, minor; +} type0; + +static struct { + const char *manufacturer, *product, *version, *serial, *sku, *family; + /* uuid is in qemu_uuid[] */ +} type1; + static QemuOptsList qemu_smbios_opts = { .name = "smbios", .head = QTAILQ_HEAD_INITIALIZER(qemu_smbios_opts.head), @@ -152,13 +164,6 @@ static void smbios_validate_table(void) } } -uint8_t *smbios_get_table(size_t *length) -{ - smbios_validate_table(); - *length = smbios_entries_len; - return smbios_entries; -} - /* * To avoid unresolvable overlaps in data, don't allow both * tables and fields for the same smbios type. @@ -182,12 +187,10 @@ static void smbios_check_collision(int type, int entry) } } -void smbios_add_field(int type, int offset, const void *data, size_t len) +static void smbios_add_field(int type, int offset, const void *data, size_t len) { struct smbios_field *field; - smbios_check_collision(type, SMBIOS_FIELD_ENTRY); - if (!smbios_entries) { smbios_entries_len = sizeof(uint16_t); smbios_entries = g_malloc0(smbios_entries_len); @@ -207,82 +210,81 @@ void smbios_add_field(int type, int offset, const void *data, size_t len) cpu_to_le16(le16_to_cpu(*(uint16_t *)smbios_entries) + 1); } -static void smbios_build_type_0_fields(QemuOpts *opts) +static void smbios_build_type_0_fields(void) { - const char *val; - unsigned char major, minor; - - val = qemu_opt_get(opts, "vendor"); - if (val) { + if (type0.vendor) { smbios_add_field(0, offsetof(struct smbios_type_0, vendor_str), - val, strlen(val) + 1); + type0.vendor, strlen(type0.vendor) + 1); } - val = qemu_opt_get(opts, "version"); - if (val) { + if (type0.version) { smbios_add_field(0, offsetof(struct smbios_type_0, bios_version_str), - val, strlen(val) + 1); + type0.version, strlen(type0.version) + 1); } - val = qemu_opt_get(opts, "date"); - if (val) { + if (type0.date) { smbios_add_field(0, offsetof(struct smbios_type_0, bios_release_date_str), - val, strlen(val) + 1); + type0.date, strlen(type0.date) + 1); } - val = qemu_opt_get(opts, "release"); - if (val) { - if (sscanf(val, "%hhu.%hhu", &major, &minor) != 2) { - error_report("Invalid release"); - exit(1); - } + if (type0.have_major_minor) { smbios_add_field(0, offsetof(struct smbios_type_0, system_bios_major_release), - &major, 1); + &type0.major, 1); smbios_add_field(0, offsetof(struct smbios_type_0, system_bios_minor_release), - &minor, 1); + &type0.minor, 1); } } -static void smbios_build_type_1_fields(QemuOpts *opts) +static void smbios_build_type_1_fields(void) { - const char *val; - - val = qemu_opt_get(opts, "manufacturer"); - if (val) { + if (type1.manufacturer) { smbios_add_field(1, offsetof(struct smbios_type_1, manufacturer_str), - val, strlen(val) + 1); + type1.manufacturer, strlen(type1.manufacturer) + 1); } - val = qemu_opt_get(opts, "product"); - if (val) { + if (type1.product) { smbios_add_field(1, offsetof(struct smbios_type_1, product_name_str), - val, strlen(val) + 1); + type1.product, strlen(type1.product) + 1); } - val = qemu_opt_get(opts, "version"); - if (val) { + if (type1.version) { smbios_add_field(1, offsetof(struct smbios_type_1, version_str), - val, strlen(val) + 1); + type1.version, strlen(type1.version) + 1); } - val = qemu_opt_get(opts, "serial"); - if (val) { + if (type1.serial) { smbios_add_field(1, offsetof(struct smbios_type_1, serial_number_str), - val, strlen(val) + 1); - } - val = qemu_opt_get(opts, "uuid"); - if (val) { - if (qemu_uuid_parse(val, qemu_uuid) != 0) { - error_report("Invalid UUID"); - exit(1); - } + type1.serial, strlen(type1.serial) + 1); } - val = qemu_opt_get(opts, "sku"); - if (val) { + if (type1.sku) { smbios_add_field(1, offsetof(struct smbios_type_1, sku_number_str), - val, strlen(val) + 1); + type1.sku, strlen(type1.sku) + 1); } - val = qemu_opt_get(opts, "family"); - if (val) { + if (type1.family) { smbios_add_field(1, offsetof(struct smbios_type_1, family_str), - val, strlen(val) + 1); + type1.family, strlen(type1.family) + 1); + } + if (qemu_uuid_set) { + smbios_add_field(1, offsetof(struct smbios_type_1, uuid), + qemu_uuid, 16); + } +} + +uint8_t *smbios_get_table(size_t *length) +{ + if (!smbios_immutable) { + smbios_build_type_0_fields(); + smbios_build_type_1_fields(); + smbios_validate_table(); + smbios_immutable = true; + } + *length = smbios_entries_len; + return smbios_entries; +} + +static void save_opt(const char **dest, QemuOpts *opts, const char *name) +{ + const char *val = qemu_opt_get(opts, name); + + if (val) { + *dest = val; } } @@ -291,6 +293,7 @@ void smbios_entry_add(QemuOpts *opts) Error *local_err = NULL; const char *val; + assert(!smbios_immutable); val = qemu_opt_get(opts, "file"); if (val) { struct smbios_structure_header *header; @@ -341,6 +344,8 @@ void smbios_entry_add(QemuOpts *opts) if (val) { unsigned long type = strtoul(val, NULL, 0); + smbios_check_collision(type, SMBIOS_FIELD_ENTRY); + switch (type) { case 0: qemu_opts_validate(opts, qemu_smbios_type0_opts, &local_err); @@ -348,7 +353,18 @@ void smbios_entry_add(QemuOpts *opts) error_report("%s", error_get_pretty(local_err)); exit(1); } - smbios_build_type_0_fields(opts); + save_opt(&type0.vendor, opts, "vendor"); + save_opt(&type0.version, opts, "version"); + save_opt(&type0.date, opts, "date"); + + val = qemu_opt_get(opts, "release"); + if (val) { + if (sscanf(val, "%hhu.%hhu", &type0.major, &type0.minor) != 2) { + error_report("Invalid release"); + exit(1); + } + type0.have_major_minor = true; + } return; case 1: qemu_opts_validate(opts, qemu_smbios_type1_opts, &local_err); @@ -356,7 +372,21 @@ void smbios_entry_add(QemuOpts *opts) error_report("%s", error_get_pretty(local_err)); exit(1); } - smbios_build_type_1_fields(opts); + save_opt(&type1.manufacturer, opts, "manufacturer"); + save_opt(&type1.product, opts, "product"); + save_opt(&type1.version, opts, "version"); + save_opt(&type1.serial, opts, "serial"); + save_opt(&type1.sku, opts, "sku"); + save_opt(&type1.family, opts, "family"); + + val = qemu_opt_get(opts, "uuid"); + if (val) { + if (qemu_uuid_parse(val, qemu_uuid) != 0) { + error_report("Invalid UUID"); + exit(1); + } + qemu_uuid_set = true; + } return; default: error_report("Don't know how to build fields for SMBIOS type %" PRIu64, diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index d9f43b7..b08ec71 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -16,7 +16,6 @@ #include "qemu/option.h" void smbios_entry_add(QemuOpts *opts); -void smbios_add_field(int type, int offset, const void *data, size_t len); uint8_t *smbios_get_table(size_t *length); /* diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 3caeb66..d490c99 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -16,6 +16,7 @@ extern const char *bios_name; extern const char *qemu_name; extern uint8_t qemu_uuid[]; +extern bool qemu_uuid_set; int qemu_uuid_parse(const char *str, uint8_t *uuid); #define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" diff --git a/vl.c b/vl.c index 0deadc4..45b4c52 100644 --- a/vl.c +++ b/vl.c @@ -254,6 +254,7 @@ uint64_t node_mem[MAX_NODES]; unsigned long *node_cpumask[MAX_NODES]; uint8_t qemu_uuid[16]; +bool qemu_uuid_set; static QEMUBootSetHandler *boot_set_handler; static void *boot_set_opaque; @@ -3662,6 +3663,7 @@ int main(int argc, char **argv, char **envp) " Wrong format.\n"); exit(1); } + qemu_uuid_set = true; break; case QEMU_OPTION_option_rom: if (nb_option_roms >= MAX_OPTION_ROMS) {