From: "Gabriel L. Somlo" <gsomlo@gmail.com>
To: qemu-devel@nongnu.org
Cc: kevin@koconnor.net, seabios@seabios.org, lersek@redhat.com,
kraxel@redhat.com, agraf@suse.de
Subject: [Qemu-devel] [QEMU v5 PATCH 02/18] SMBIOS: Use macro to set smbios defaults
Date: Fri, 11 Apr 2014 12:11:42 -0400 [thread overview]
Message-ID: <1397232718-15282-3-git-send-email-somlo@cmu.edu> (raw)
In-Reply-To: <1397232718-15282-1-git-send-email-somlo@cmu.edu>
The function smbios_set_defaults() uses a repeating code pattern
for each field. This patch replaces that pattern with a macro.
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
---
hw/i386/smbios.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index 89dc070..f4ee7b4 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -256,18 +256,17 @@ static void smbios_build_type_1_fields(void)
}
}
+#define SMBIOS_SET_DEFAULT(field, value) \
+ if (!field) { \
+ field = value; \
+ }
+
void smbios_set_defaults(const char *manufacturer,
const char *product, const char *version)
{
- if (!type1.manufacturer) {
- type1.manufacturer = manufacturer;
- }
- if (!type1.product) {
- type1.product = product;
- }
- if (!type1.version) {
- type1.version = version;
- }
+ SMBIOS_SET_DEFAULT(type1.manufacturer, manufacturer);
+ SMBIOS_SET_DEFAULT(type1.product, product);
+ SMBIOS_SET_DEFAULT(type1.version, version);
}
uint8_t *smbios_get_table(size_t *length)
--
1.9.0
next prev parent reply other threads:[~2014-04-11 16:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-11 16:11 [Qemu-devel] [QEMU v5 PATCH 00/18] SMBIOS: build full tables in QEMU Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 01/18] SMBIOS: Rename smbios_set_type1_defaults() for more general use Gabriel L. Somlo
2014-04-11 16:11 ` Gabriel L. Somlo [this message]
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 03/18] SMBIOS: Use bitmaps to check for smbios table collisions Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 04/18] SMBIOS: Add code to build full smbios tables; build type 2 table Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 05/18] SMBIOS: Build full tables for types 0 and 1 Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 06/18] SMBIOS: Remove unused code for passing individual fields to bios Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 07/18] SMBIOS: Build full type 3 table Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 08/18] SMBIOS: Build full type 4 tables Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 09/18] SMBIOS: Build full smbios memory tables (type 16, 17, 19, and 20) Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 10/18] SMBIOS: Build full tables for type 32 and 127 Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 11/18] SMBIOS: Update all table definitions to smbios spec v2.3 Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 12/18] SMBIOS: Remove SeaBIOS compatibility quirks Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 13/18] SMBIOS: Stop including type 20 tables Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 14/18] SMBIOS: Use e820 memory map to generate type 19 tables Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 15/18] SMBIOS: Update type 3 definition to smbios spec v2.7 Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 16/18] SMBIOS: Update type 4 definition to smbios spec v2.6 Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 17/18] SMBIOS: Update memory table types (16, 17, and 19) to smbios spec v2.8 Gabriel L. Somlo
2014-04-11 16:11 ` [Qemu-devel] [QEMU v5 PATCH 18/18] SMBIOS: Generate complete smbios tables, including entry point Gabriel L. Somlo
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=1397232718-15282-3-git-send-email-somlo@cmu.edu \
--to=gsomlo@gmail.com \
--cc=agraf@suse.de \
--cc=kevin@koconnor.net \
--cc=kraxel@redhat.com \
--cc=lersek@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=seabios@seabios.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).