summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGabriel L. Somlo <gsomlo@gmail.com>2014-04-23 09:42:40 -0400
committerGerd Hoffmann <kraxel@redhat.com>2014-05-05 12:29:39 +0200
commitcb36acb672a380b4ca430e4a12abb3f2186f9f4f (patch)
treebd368c46d3c52200d3fce3c2069f1d5597537cad
parente41fca3da72d556942a3e0dc601fbeca5eaab9ce (diff)
downloadfocaccia-qemu-cb36acb672a380b4ca430e4a12abb3f2186f9f4f.tar.gz
focaccia-qemu-cb36acb672a380b4ca430e4a12abb3f2186f9f4f.zip
SMBIOS: Use macro to set smbios defaults
The function smbios_set_defaults() uses a repeating code pattern
for each field. This patch replaces that pattern with a macro.

This patch contains no functional changes.

Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/i386/smbios.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index e734d4cc29..9f83bfba58 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -260,20 +260,6 @@ static void smbios_build_type_1_fields(void)
     }
 }
 
-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;
-    }
-}
-
 uint8_t *smbios_get_table_legacy(size_t *length)
 {
     if (!smbios_immutable) {
@@ -288,6 +274,19 @@ uint8_t *smbios_get_table_legacy(size_t *length)
 /* end: legacy setup functions for <= 2.0 machines */
 
 
+#define SMBIOS_SET_DEFAULT(field, value)                                  \
+    if (!field) {                                                         \
+        field = value;                                                    \
+    }
+
+void smbios_set_defaults(const char *manufacturer, const char *product,
+                         const char *version)
+{
+    SMBIOS_SET_DEFAULT(type1.manufacturer, manufacturer);
+    SMBIOS_SET_DEFAULT(type1.product, product);
+    SMBIOS_SET_DEFAULT(type1.version, version);
+}
+
 static void save_opt(const char **dest, QemuOpts *opts, const char *name)
 {
     const char *val = qemu_opt_get(opts, name);