From patchwork Mon Apr 21 19:27:10 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: 341046 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 14CF11400ED for ; Tue, 22 Apr 2014 13:16:51 +1000 (EST) Received: from localhost ([::1]:51051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcJt4-0005ox-5q for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 15:28:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcJsN-0003gl-VY for qemu-devel@nongnu.org; Mon, 21 Apr 2014 15:27:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcJsD-0007PS-Tt for qemu-devel@nongnu.org; Mon, 21 Apr 2014 15:27:35 -0400 Received: from mail-yk0-x234.google.com ([2607:f8b0:4002:c07::234]:43736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcJsD-0007PO-Q5 for qemu-devel@nongnu.org; Mon, 21 Apr 2014 15:27:25 -0400 Received: by mail-yk0-f180.google.com with SMTP id 19so3746382ykq.11 for ; Mon, 21 Apr 2014 12:27:25 -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=PAKsNytZxSZ3fdBiPHunAvz+sRFzs5F+RfYm/XT2pzs=; b=kfzw5F/rLILU4+L2TGD6l7JBQV5Uh+wwWZJjDhHMt/BCtwm3Q53jim3f+FTPzLO/NE xtcAB8B3WCtXlxjY/09qTN3w+Zg6sNFlsThhIjqldeUbfKZyseIXcsEzbQRO57Gc5u/H FkmuV0RcRGADkiy57UzAXNH9/9kqq/cJwMGRZvaQlRirtiAaMM3V04N52c+Zts3gJndU AjYj3yrbvvwN3z3J/wo8KIUiu75b612wMJtwP+1YWVSrtko/KLp2wskY9/wvzSHBhnTp lbmybHp9VJ5qyssVaVRVDEadfNXjsDgewGGx2A0lTDg1ylT0c21qobnwHXiz2epxcI3H nARg== X-Received: by 10.236.134.71 with SMTP id r47mr5693863yhi.83.1398108445455; Mon, 21 Apr 2014 12:27:25 -0700 (PDT) Received: from ERROL.ini.cmu.edu (ERROL.INI.CMU.EDU. [128.2.16.43]) by mx.google.com with ESMTPSA id m23sm71413269yho.15.2014.04.21.12.27.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Apr 2014 12:27:25 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Mon, 21 Apr 2014 15:27:10 -0400 Message-Id: <1398108434-18660-4-git-send-email-somlo@cmu.edu> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398108434-18660-1-git-send-email-somlo@cmu.edu> References: <1398108434-18660-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:4002:c07::234 Cc: seabios@seabios.org, agraf@suse.de, armbru@redhat.com, kevin@koconnor.net, kraxel@redhat.com, lersek@redhat.com Subject: [Qemu-devel] [QEMU v7 PATCH 3/7] 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 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 --- hw/i386/smbios.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index e734d4c..9f83bfb 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);