From patchwork Sun Mar 9 03:03:39 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: 328267 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 CB61D2C00B2 for ; Sun, 9 Mar 2014 14:07:09 +1100 (EST) Received: from localhost ([::1]:42465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMU4x-0001qC-Hm for incoming@patchwork.ozlabs.org; Sat, 08 Mar 2014 22:07:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMU4c-0001ma-Hw for qemu-devel@nongnu.org; Sat, 08 Mar 2014 22:06:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMU4W-00071Y-VP for qemu-devel@nongnu.org; Sat, 08 Mar 2014 22:06:46 -0500 Received: from mail-qg0-x22b.google.com ([2607:f8b0:400d:c04::22b]:33477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMU4W-00071T-QW for qemu-devel@nongnu.org; Sat, 08 Mar 2014 22:06:40 -0500 Received: by mail-qg0-f43.google.com with SMTP id f51so414973qge.2 for ; Sat, 08 Mar 2014 19:06:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=1aIz9ITNPaFr5GTw74pcpOhz1nxTCcwRE/fpYM+Urd4=; b=LT1W95zZZeYsm+53PCQrFaphFUczDn3m4rh8wQjhWP7I7p7S/+b4SgrPL1pobdxqY9 Q+DCPoXPJkZMhknOZOoXaTRXbd7GebV6V+2tjgkCaAg515tI4DlCaMTVRMMN9iCkXznV TjCOIuW1WeeWYkm/JBdTahgmZ5q41lt5tevrZ3Sf0r2FocXqJp65tDVlqk61suyn1/+t 4F/Y3Lwww6b6tDk6uwnatjYvpq8EVIT91Tk3NMRd/nLGHQcZplh8nARQzRliif9tImBx NiGPVsxxGxNOa7pcMAJMx/S/+4Jvhl/8xPTpMYhjLaWfaKwL3z3o1+E2PG9MpKdTZclL 7hNQ== X-Received: by 10.224.4.5 with SMTP id 5mr32197395qap.61.1394334400548; Sat, 08 Mar 2014 19:06:40 -0800 (PST) Received: from ERROL.INI.CMU.EDU (ERROL.INI.CMU.EDU. [128.2.16.43]) by mx.google.com with ESMTPSA id y9sm16258804qas.15.2014.03.08.19.06.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 08 Mar 2014 19:06:40 -0800 (PST) Date: Sat, 8 Mar 2014 22:03:39 -0500 From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Message-ID: <20140309030338.GB17184@ERROL.INI.CMU.EDU> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5318AAA0.1090301@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22b Cc: kevin@koconnor.net, lersek@redhat.com, kraxel@redhat.com, agraf@suse.de Subject: [Qemu-devel] [PATCH 4/7] SMBIOS: Replace type collision check mechanism with bitmaps 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 Replace existing smbios_check_collision() functionality with a pair of bitmaps: have_binfile_bitmap and have_fields_bitmap. Bits corresponding to each smbios type are set by smbios_entry_add(), which also uses the bitmaps to ensure that binary blobs and field values are never accepted for the same type. These bitmaps will also be used in the future to decide whether or not to build a full table for a given smbios type. Signed-off-by: Gabriel Somlo --- hw/i386/smbios.c | 51 ++++++++++++++++++++---------------------------- include/hw/i386/smbios.h | 2 ++ 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index f4ee7b4..6889332 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -49,11 +49,8 @@ static size_t smbios_entries_len; static int smbios_type4_count = 0; static bool smbios_immutable; -static struct { - bool seen; - int headertype; - Location loc; -} first_opt[2]; +static DECLARE_BITMAP(have_binfile_bitmap, SMBIOS_MAX_TYPE+1); +static DECLARE_BITMAP(have_fields_bitmap, SMBIOS_MAX_TYPE+1); static struct { const char *vendor, *version, *date; @@ -164,29 +161,6 @@ static void smbios_validate_table(void) } } -/* - * To avoid unresolvable overlaps in data, don't allow both - * tables and fields for the same smbios type. - */ -static void smbios_check_collision(int type, int entry) -{ - if (type < ARRAY_SIZE(first_opt)) { - if (first_opt[type].seen) { - if (first_opt[type].headertype != entry) { - error_report("Can't mix file= and type= for same type"); - loc_push_restore(&first_opt[type].loc); - error_report("This is the conflicting setting"); - loc_pop(&first_opt[type].loc); - exit(1); - } - } else { - first_opt[type].seen = true; - first_opt[type].headertype = entry; - loc_save(&first_opt[type].loc); - } - } -} - static void smbios_add_field(int type, int offset, const void *data, size_t len) { struct smbios_field *field; @@ -331,7 +305,14 @@ void smbios_entry_add(QemuOpts *opts) } header = (struct smbios_structure_header *)(table->data); - smbios_check_collision(header->type, SMBIOS_TABLE_ENTRY); + + if (test_bit(header->type, have_fields_bitmap)) { + error_report("Can't add binary type %d table! " + "(fields already specified)", header->type); + exit(1); + } + set_bit(header->type, have_binfile_bitmap); + if (header->type == 4) { smbios_type4_count++; } @@ -346,7 +327,17 @@ void smbios_entry_add(QemuOpts *opts) if (val) { unsigned long type = strtoul(val, NULL, 0); - smbios_check_collision(type, SMBIOS_FIELD_ENTRY); + if (type > SMBIOS_MAX_TYPE) { + error_report("smbios type (%ld) out of range!", type); + exit(1); + } + + if (test_bit(type, have_binfile_bitmap)) { + error_report("Can't add fields for type %ld table! " + "(binary file already loaded)", type); + exit(1); + } + set_bit(type, have_fields_bitmap); switch (type) { case 0: diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index a7ec973..8b63441 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -15,6 +15,8 @@ #include "qemu/option.h" +#define SMBIOS_MAX_TYPE 127 + void smbios_entry_add(QemuOpts *opts); void smbios_set_defaults(const char *manufacturer, const char *product, const char *version);