From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOTF-0005VV-Lg for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:20:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNOT9-0007Fq-UR for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:19:57 -0400 Received: from mail-qa0-x234.google.com ([2607:f8b0:400d:c00::234]:37153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOT9-0007Fi-Qd for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:19:51 -0400 Received: by mail-qa0-f52.google.com with SMTP id m5so8568806qaj.11 for ; Tue, 11 Mar 2014 08:19:51 -0700 (PDT) From: "Gabriel L. Somlo" Date: Tue, 11 Mar 2014 11:16:19 -0400 Message-Id: <1394550989-693-4-git-send-email-somlo@cmu.edu> In-Reply-To: <1394550989-693-1-git-send-email-somlo@cmu.edu> References: <1394532186.22422.24.camel@nilsson.home.kraxel.org> <1394550989-693-1-git-send-email-somlo@cmu.edu> Subject: [Qemu-devel] [v2 PATCH 03/13] SMBIOS: Use macro to set smbios defaults List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, gsomlo@gmail.com, armbru@redhat.com, alex.williamson@redhat.com, kevin@koconnor.net, kraxel@redhat.com, lersek@redhat.com From: "Gabriel L. Somlo" 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 --- 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.8.1.4