From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, lersek@redhat.com, ehabkost@redhat.com
Subject: [Qemu-devel] [PATCH 5/7] smbios: Factor out smbios_maybe_add_str()
Date: Wed, 17 Jul 2013 19:16:07 +0200 [thread overview]
Message-ID: <1374081369-1511-6-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1374081369-1511-1-git-send-email-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/i386/smbios.c | 61 +++++++++++++++++++++++---------------------------------
1 file changed, 25 insertions(+), 36 deletions(-)
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index fb1b27b..a2eb9bf 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -210,21 +210,22 @@ static 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(void)
+static void smbios_maybe_add_str(int type, int offset, const char *data)
{
- if (type0.vendor) {
- smbios_add_field(0, offsetof(struct smbios_type_0, vendor_str),
- type0.vendor, strlen(type0.vendor) + 1);
- }
- if (type0.version) {
- smbios_add_field(0, offsetof(struct smbios_type_0, bios_version_str),
- type0.version, strlen(type0.version) + 1);
+ if (data) {
+ smbios_add_field(type, offset, data, strlen(data) + 1);
}
- if (type0.date) {
- smbios_add_field(0, offsetof(struct smbios_type_0,
+}
+
+static void smbios_build_type_0_fields(void)
+{
+ smbios_maybe_add_str(0, offsetof(struct smbios_type_0, vendor_str),
+ type0.vendor);
+ smbios_maybe_add_str(0, offsetof(struct smbios_type_0, bios_version_str),
+ type0.version);
+ smbios_maybe_add_str(0, offsetof(struct smbios_type_0,
bios_release_date_str),
- type0.date, strlen(type0.date) + 1);
- }
+ type0.date);
if (type0.have_major_minor) {
smbios_add_field(0, offsetof(struct smbios_type_0,
system_bios_major_release),
@@ -237,30 +238,18 @@ static void smbios_build_type_0_fields(void)
static void smbios_build_type_1_fields(void)
{
- if (type1.manufacturer) {
- smbios_add_field(1, offsetof(struct smbios_type_1, manufacturer_str),
- type1.manufacturer, strlen(type1.manufacturer) + 1);
- }
- if (type1.product) {
- smbios_add_field(1, offsetof(struct smbios_type_1, product_name_str),
- type1.product, strlen(type1.product) + 1);
- }
- if (type1.version) {
- smbios_add_field(1, offsetof(struct smbios_type_1, version_str),
- type1.version, strlen(type1.version) + 1);
- }
- if (type1.serial) {
- smbios_add_field(1, offsetof(struct smbios_type_1, serial_number_str),
- type1.serial, strlen(type1.serial) + 1);
- }
- if (type1.sku) {
- smbios_add_field(1, offsetof(struct smbios_type_1, sku_number_str),
- type1.sku, strlen(type1.sku) + 1);
- }
- if (type1.family) {
- smbios_add_field(1, offsetof(struct smbios_type_1, family_str),
- type1.family, strlen(type1.family) + 1);
- }
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, manufacturer_str),
+ type1.manufacturer);
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, product_name_str),
+ type1.product);
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, version_str),
+ type1.version);
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, serial_number_str),
+ type1.serial);
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, sku_number_str),
+ type1.sku);
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, family_str),
+ type1.family);
if (qemu_uuid_set) {
smbios_add_field(1, offsetof(struct smbios_type_1, uuid),
qemu_uuid, 16);
--
1.7.11.7
next prev parent reply other threads:[~2013-07-17 17:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 17:16 [Qemu-devel] [PATCH 0/7] smbios cleanup & nicer defaults for type 1 Markus Armbruster
2013-07-17 17:16 ` [Qemu-devel] [PATCH 1/7] smbios: Normalize smbios_entry_add()'s error handling to exit(1) Markus Armbruster
2013-07-17 17:53 ` Eric Blake
2013-07-17 17:16 ` [Qemu-devel] [PATCH 2/7] smbios: Convert to QemuOpts Markus Armbruster
2013-07-17 19:04 ` Eric Blake
2013-07-17 17:16 ` [Qemu-devel] [PATCH 3/7] smbios: Improve diagnostics for conflicting entries Markus Armbruster
2013-07-17 19:09 ` Eric Blake
2013-07-17 17:16 ` [Qemu-devel] [PATCH 4/7] smbios: Make multiple -smbios type= accumulate sanely Markus Armbruster
2013-07-17 19:21 ` Eric Blake
2013-07-17 20:31 ` Markus Armbruster
2013-07-17 17:16 ` Markus Armbruster [this message]
2013-07-17 19:22 ` [Qemu-devel] [PATCH 5/7] smbios: Factor out smbios_maybe_add_str() Eric Blake
2013-07-17 17:16 ` [Qemu-devel] [PATCH 6/7] vl: Set current_machine early Markus Armbruster
2013-07-17 19:23 ` Eric Blake
2013-07-17 17:16 ` [Qemu-devel] [PATCH 7/7] smbios: Set system manufacturer, product & version by default Markus Armbruster
2013-07-17 19:24 ` Eric Blake
2013-07-30 6:01 ` [Qemu-devel] [PATCH 0/7] smbios cleanup & nicer defaults for type 1 Markus Armbruster
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=1374081369-1511-6-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=ehabkost@redhat.com \
--cc=lersek@redhat.com \
--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).