From patchwork Wed Mar 12 16:40:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel L. Somlo" X-Patchwork-Id: 329549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 32EA32C00B9 for ; Thu, 13 Mar 2014 03:44:24 +1100 (EST) Received: from localhost ([::1]:33522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNmGT-0003Ij-QA for incoming@patchwork.ozlabs.org; Wed, 12 Mar 2014 12:44:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNmFp-0003Dc-9a for qemu-devel@nongnu.org; Wed, 12 Mar 2014 12:43:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNmFh-0008Q1-3H for qemu-devel@nongnu.org; Wed, 12 Mar 2014 12:43:41 -0400 Received: from mail-qc0-x232.google.com ([2607:f8b0:400d:c01::232]:50999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNmFg-0008Pu-Ug for qemu-devel@nongnu.org; Wed, 12 Mar 2014 12:43:33 -0400 Received: by mail-qc0-f178.google.com with SMTP id i8so11728198qcq.9 for ; Wed, 12 Mar 2014 09:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=60dwHVdt1ftY1PWnThAQCj94BtWgBx9SLbuHw0VpOrM=; b=Bs+GDyJ0p4p6WmphXtz+mj/4hM0T6GFeBMVqk7ILoY2TI5lONj8fGDVd4mJD/RFie6 YyupZXfLd92sJpCNsXABn5qol12Ld9MIQBWLKaptneaGhy5IoOYMP3BytYn8VthDSxr6 /E+KTLL4qPhWsP1385n8JUmBzoXGPu6pDqyDZEAYdVU5GNYcn1s0Fy6BYZO10yECDksK kkVWPNMZ55wOn0kOprXHbbKNjymdnisGUfyNwtK/zVRVn8ifNF2UiPdNQuxlRtc9Yc1L DnKAeA+XVSI+BiiYYtDwI10OPfaT/HCriUjrvAHXHPUvL+8VFKpmEPRXWvTdGrRFBeFk YR1g== X-Received: by 10.140.43.10 with SMTP id d10mr13423939qga.45.1394642612350; Wed, 12 Mar 2014 09:43:32 -0700 (PDT) Received: from ERROL.ini.cmu.edu (ERROL.INI.CMU.EDU. [128.2.16.43]) by mx.google.com with ESMTPSA id u15sm35106301qge.2.2014.03.12.09.43.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Mar 2014 09:43:32 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Wed, 12 Mar 2014 12:40:01 -0400 Message-Id: <1394642412-29317-3-git-send-email-somlo@cmu.edu> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1394642412-29317-1-git-send-email-somlo@cmu.edu> References: <1394612454.17393.16.camel@nilsson.home.kraxel.org> <1394642412-29317-1-git-send-email-somlo@cmu.edu> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::232 Cc: agraf@suse.de, gsomlo@gmail.com, armbru@redhat.com, alex.williamson@redhat.com, kevin@koconnor.net, kraxel@redhat.com, lersek@redhat.com Subject: [Qemu-devel] [v3 PATCH 02/13] SMBIOS: Use macro to set smbios defaults X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)