From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Corey Minyard <cminyard@mvista.com>,
Igor Mammedov <imammedo@redhat.com>
Subject: [Qemu-devel] [PULL v2 12/32] smbios: Move table build tools into an include file.
Date: Tue, 14 Jun 2016 22:59:49 +0300 [thread overview]
Message-ID: <20160614225949-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <1465934227-16558-1-git-send-email-mst@redhat.com>
From: Corey Minyard <cminyard@mvista.com>
This will let things in other files (like IPMI) build SMBIOS tables.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/smbios/smbios_build.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
hw/smbios/smbios.c | 70 ++++----------------------------------
2 files changed, 93 insertions(+), 64 deletions(-)
create mode 100644 hw/smbios/smbios_build.h
diff --git a/hw/smbios/smbios_build.h b/hw/smbios/smbios_build.h
new file mode 100644
index 0000000..68b8b72
--- /dev/null
+++ b/hw/smbios/smbios_build.h
@@ -0,0 +1,87 @@
+/*
+ * SMBIOS Support
+ *
+ * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * Authors:
+ * Alex Williamson <alex.williamson@hp.com>
+ * Markus Armbruster <armbru@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#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 */
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 */
--
MST
next prev parent reply other threads:[~2016-06-14 19:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1465934227-16558-1-git-send-email-mst@redhat.com>
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 01/32] pci: fix pci_requester_id() Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 02/32] vhost-user: add ability to know vhost-user backend disconnection Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 03/32] tests/vhost-user-bridge: add client mode Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 04/32] tests/vhost-user-bridge: workaround stale vring base Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 05/32] qemu-char: add qemu_chr_disconnect to close a fd accepted by listen fd Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 06/32] vhost-user: disconnect on start failure Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 07/32] vhost-net: do not crash if backend is not present Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 08/32] vhost-net: save & restore vhost-user acked features Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 09/32] vhost-net: save & restore vring enable state Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 10/32] tests: append i386 tests Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 11/32] test: start vhost-user reconnect test Michael S. Tsirkin
2016-06-14 19:59 ` Michael S. Tsirkin [this message]
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 13/32] ipmi: Add SMBIOS table entry Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 14/32] acpi: Add IPMI table entries Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 15/32] bios: Add tests for the IPMI ACPI and SMBIOS entries Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 16/32] pci core: assert ENOSPC when add capability Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 17/32] fix some coding style problems Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 18/32] msi_init: change return value to 0 on success Michael S. Tsirkin
2016-06-14 19:59 ` [Qemu-devel] [PULL v2 19/32] pc-dimm: introduce get_vmstate_memory_region callback Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 20/32] nvdimm: support nvdimm label Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 21/32] acpi: add aml_object_type Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 22/32] acpi: add aml_call5 Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 23/32] nvdimm acpi: set HDLE properly Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 24/32] nvdimm acpi: save arg3 of _DSM method Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 25/32] nvdimm acpi: check UUID Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 26/32] nvdimm acpi: abstract the operations for root & nvdimm devices Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 27/32] nvdimm acpi: check revision Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 28/32] nvdimm acpi: support Get Namespace Label Size function Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 29/32] nvdimm acpi: support Get Namespace Label Data function Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 30/32] nvdimm acpi: support Set " Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 31/32] docs: add NVDIMM ACPI documentation Michael S. Tsirkin
2016-06-14 20:00 ` [Qemu-devel] [PULL v2 32/32] MAINTAINERS: add Marcel to PCI Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160614225949-mutt-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=cminyard@mvista.com \
--cc=imammedo@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).