From patchwork Thu Apr 7 14:13:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 65328 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp104995lbl; Thu, 7 Apr 2016 07:16:28 -0700 (PDT) X-Received: by 10.140.42.68 with SMTP id b62mr4019264qga.12.1460038588832; Thu, 07 Apr 2016 07:16:28 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y16si6031044qhb.66.2016.04.07.07.16.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Apr 2016 07:16:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:50113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAjU-0007BN-5p for patch@linaro.org; Thu, 07 Apr 2016 10:16:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAgS-0002fW-Ab for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoAgM-0006bF-4V for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:19 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:34940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAgL-0006b6-PK for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:14 -0400 Received: by mail-pf0-x242.google.com with SMTP id r187so7291227pfr.2 for ; Thu, 07 Apr 2016 07:13:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=j1ANDRlrWGhlbmgAeUqPr1zjdUQVlbeZC7mT5T47Fb0=; b=rMizhMLS0NXQlp3LqTnlq4HEr+3Vh+cvZwW2Q2TqsqZpFYJIhT3lN70hQ8N954hPWx NrATfF4oltgKM8laI/ouJHtxk/QfKpcLxTZqYG5YwX7dtjgWwY06TYz0CjMcGDLTWUNm HlT/OEoCwPDbNIMVWjSsO6PXkdO5EfdrGiYsJ3nfQiv9XOLOup572xbinngff20iRV57 4delFb7goIhyaGWXt4N5c67cLwpM5425F1c/gZpcpFWTZmLawE7Tsr9zWzj+LxqCi/6Z jmBpoBlPjmworViEcXbZzMM6H+Pl70LYI7QNsGylMms5yofPHMasX83L6K27/MiGt9DY yjmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=j1ANDRlrWGhlbmgAeUqPr1zjdUQVlbeZC7mT5T47Fb0=; b=CMpQcarNTWC2OAjW7YZhPlUWu9Y9VKM7FyAPZadiaafSWB+J07k7fjCymUVnia2eem 80a6K8teA4WpVF/ZI6Yf/Act7yBV4Xo3diGvs23G/fJS5qdaS4iTv18lNXA34HofLrKi +O5Oal34LbLOtw+JiMqAFkL6/Vd5VvEkNSBMQ8QmebEMW81yiwhArrI2ErYbo2RZ/beP StZl5rhgZVRBNrRrTSrfKD7GQEDFPVQD3xXX9vPwe9y83xMY4ITLweKpPvReeB8cige9 JMsnBJaS2K4o9KRA0f+XD8rpeY0LHAdurjo11wfA6mxbSyten26d8twrl4CqiFCREXgF KPtQ== X-Gm-Message-State: AD7BkJJvelJmOBRcdKYJl6yD1UbKhrl2A9oSFElbueDw+gBakq0DIUm6uIYFi4OS7jaNtQ== X-Received: by 10.98.69.75 with SMTP id s72mr5066088pfa.66.1460038392631; Thu, 07 Apr 2016 07:13:12 -0700 (PDT) Received: from serve.minyard.net ([173.57.176.17]) by smtp.gmail.com with ESMTPSA id tp9sm12677592pab.14.2016.04.07.07.13.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Apr 2016 07:13:11 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id D618C1415; Thu, 7 Apr 2016 09:13:09 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 702B130003C; Thu, 7 Apr 2016 09:13:08 -0500 (CDT) From: minyard@acm.org To: "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , qemu-devel@nongnu.org Date: Thu, 7 Apr 2016 09:13:00 -0500 Message-Id: <1460038383-5318-4-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460038383-5318-1-git-send-email-minyard@acm.org> References: <1460038383-5318-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH v6 3/6] smbios: Move table build tools into an include file. 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Corey Minyard This will let things in other files (like IPMI) build SMBIOS tables. Signed-off-by: Corey Minyard --- hw/smbios/smbios.c | 70 ++++--------------------------------------- hw/smbios/smbios_build.h | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 64 deletions(-) create mode 100644 hw/smbios/smbios_build.h -- 2.5.0 diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index cb8a111..5dc3e43 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -24,6 +24,7 @@ #include "hw/smbios/smbios.h" #include "hw/loader.h" #include "exec/cpu-common.h" +#include "smbios_build.h" /* legacy structures and constants for <= 2.0 machines */ struct smbios_header { @@ -53,10 +54,10 @@ static bool smbios_uuid_encoded = true; /* end: legacy structures & constants for <= 2.0 machines */ -static uint8_t *smbios_tables; -static size_t smbios_tables_len; -static unsigned smbios_table_max; -static unsigned smbios_table_cnt; +uint8_t *smbios_tables; +size_t smbios_tables_len; +unsigned smbios_table_max; +unsigned smbios_table_cnt; static SmbiosEntryPointType smbios_ep_type = SMBIOS_ENTRY_POINT_21; static SmbiosEntryPoint ep; @@ -429,7 +430,7 @@ uint8_t *smbios_get_table_legacy(size_t *length) /* end: legacy setup functions for <= 2.0 machines */ -static bool smbios_skip_table(uint8_t type, bool required_table) +bool smbios_skip_table(uint8_t type, bool required_table) { if (test_bit(type, have_binfile_bitmap)) { return true; /* user provided their own binary blob(s) */ @@ -443,65 +444,6 @@ static bool smbios_skip_table(uint8_t type, bool required_table) return true; } -#define SMBIOS_BUILD_TABLE_PRE(tbl_type, tbl_handle, tbl_required) \ - struct smbios_type_##tbl_type *t; \ - size_t t_off; /* table offset into smbios_tables */ \ - int str_index = 0; \ - do { \ - /* should we skip building this table ? */ \ - if (smbios_skip_table(tbl_type, tbl_required)) { \ - return; \ - } \ - \ - /* use offset of table t within smbios_tables */ \ - /* (pointer must be updated after each realloc) */ \ - t_off = smbios_tables_len; \ - smbios_tables_len += sizeof(*t); \ - smbios_tables = g_realloc(smbios_tables, smbios_tables_len); \ - t = (struct smbios_type_##tbl_type *)(smbios_tables + t_off); \ - \ - t->header.type = tbl_type; \ - t->header.length = sizeof(*t); \ - t->header.handle = cpu_to_le16(tbl_handle); \ - } while (0) - -#define SMBIOS_TABLE_SET_STR(tbl_type, field, value) \ - do { \ - int len = (value != NULL) ? strlen(value) + 1 : 0; \ - if (len > 1) { \ - smbios_tables = g_realloc(smbios_tables, \ - smbios_tables_len + len); \ - memcpy(smbios_tables + smbios_tables_len, value, len); \ - smbios_tables_len += len; \ - /* update pointer post-realloc */ \ - t = (struct smbios_type_##tbl_type *)(smbios_tables + t_off); \ - t->field = ++str_index; \ - } else { \ - t->field = 0; \ - } \ - } while (0) - -#define SMBIOS_BUILD_TABLE_POST \ - do { \ - size_t term_cnt, t_size; \ - \ - /* add '\0' terminator (add two if no strings defined) */ \ - term_cnt = (str_index == 0) ? 2 : 1; \ - smbios_tables = g_realloc(smbios_tables, \ - smbios_tables_len + term_cnt); \ - memset(smbios_tables + smbios_tables_len, 0, term_cnt); \ - smbios_tables_len += term_cnt; \ - \ - /* update smbios max. element size */ \ - t_size = smbios_tables_len - t_off; \ - if (t_size > smbios_table_max) { \ - smbios_table_max = t_size; \ - } \ - \ - /* update smbios element count */ \ - smbios_table_cnt++; \ - } while (0) - static void smbios_build_type_0_table(void) { SMBIOS_BUILD_TABLE_PRE(0, 0x000, false); /* optional, leave up to BIOS */ diff --git a/hw/smbios/smbios_build.h b/hw/smbios/smbios_build.h new file mode 100644 index 0000000..2257721 --- /dev/null +++ b/hw/smbios/smbios_build.h @@ -0,0 +1,77 @@ +/* + * SMBIOS Support + * + * Copyright (C) 2009 Hewlett-Packard Development Company, L.P. + * Copyright (C) 2013 Red Hat, Inc. + */ + +#ifndef QEMU_SMBIOS_BUILD_H +#define QEMU_SMBIOS_BUILD_H + +bool smbios_skip_table(uint8_t type, bool required_table); + +extern uint8_t *smbios_tables; +extern size_t smbios_tables_len; +extern unsigned smbios_table_max; +extern unsigned smbios_table_cnt; + +#define SMBIOS_BUILD_TABLE_PRE(tbl_type, tbl_handle, tbl_required) \ + struct smbios_type_##tbl_type *t; \ + size_t t_off; /* table offset into smbios_tables */ \ + int str_index = 0; \ + do { \ + /* should we skip building this table ? */ \ + if (smbios_skip_table(tbl_type, tbl_required)) { \ + return; \ + } \ + \ + /* use offset of table t within smbios_tables */ \ + /* (pointer must be updated after each realloc) */ \ + t_off = smbios_tables_len; \ + smbios_tables_len += sizeof(*t); \ + smbios_tables = g_realloc(smbios_tables, smbios_tables_len); \ + t = (struct smbios_type_##tbl_type *)(smbios_tables + t_off); \ + \ + t->header.type = tbl_type; \ + t->header.length = sizeof(*t); \ + t->header.handle = cpu_to_le16(tbl_handle); \ + } while (0) + +#define SMBIOS_TABLE_SET_STR(tbl_type, field, value) \ + do { \ + int len = (value != NULL) ? strlen(value) + 1 : 0; \ + if (len > 1) { \ + smbios_tables = g_realloc(smbios_tables, \ + smbios_tables_len + len); \ + memcpy(smbios_tables + smbios_tables_len, value, len); \ + smbios_tables_len += len; \ + /* update pointer post-realloc */ \ + t = (struct smbios_type_##tbl_type *)(smbios_tables + t_off); \ + t->field = ++str_index; \ + } else { \ + t->field = 0; \ + } \ + } while (0) + +#define SMBIOS_BUILD_TABLE_POST \ + do { \ + size_t term_cnt, t_size; \ + \ + /* add '\0' terminator (add two if no strings defined) */ \ + term_cnt = (str_index == 0) ? 2 : 1; \ + smbios_tables = g_realloc(smbios_tables, \ + smbios_tables_len + term_cnt); \ + memset(smbios_tables + smbios_tables_len, 0, term_cnt); \ + smbios_tables_len += term_cnt; \ + \ + /* update smbios max. element size */ \ + t_size = smbios_tables_len - t_off; \ + if (t_size > smbios_table_max) { \ + smbios_table_max = t_size; \ + } \ + \ + /* update smbios element count */ \ + smbios_table_cnt++; \ + } while (0) + +#endif /* QEMU_SMBIOS_BUILD_H */