From patchwork Mon May 11 20:55:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 471031 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 6CC8D140D16 for ; Tue, 12 May 2015 06:56:38 +1000 (AEST) Received: from localhost ([::1]:39623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yruke-0005Bn-JK for incoming@patchwork.ozlabs.org; Mon, 11 May 2015 16:56:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrukE-0004Kx-A4 for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrukD-0005HJ-1Z for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrukC-0005HF-SC for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:08 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 579718E685; Mon, 11 May 2015 20:56:08 +0000 (UTC) Received: from localhost (ovpn-113-174.phx2.redhat.com [10.3.113.174]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4BKu7PD010767; Mon, 11 May 2015 16:56:07 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 11 May 2015 17:55:45 -0300 Message-Id: <1431377756-19579-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1431377756-19579-1-git-send-email-ehabkost@redhat.com> References: <1431377756-19579-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Alexander Graf , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 02/13] hw: Move commas inside HW_COMPAT_2_1 macro 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 Changing the convention to include commas inside the macros will allow macros containing empty lists to be defined and used without compilation errors. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/ppc/spapr.c | 2 +- include/hw/compat.h | 2 +- include/hw/i386/pc.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index b4ec3ce..0536056 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -542,7 +542,7 @@ static QEMUMachine pc_i440fx_machine_v2_1 = { .name = "pc-i440fx-2.1", .init = pc_init_pci_2_1, .compat_props = (GlobalProperty[]) { - HW_COMPAT_2_1, + HW_COMPAT_2_1 { /* end of list */ } }, }; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index dcc17c0..0248357 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -439,7 +439,7 @@ static QEMUMachine pc_q35_machine_v2_1 = { .name = "pc-q35-2.1", .init = pc_q35_init_2_1, .compat_props = (GlobalProperty[]) { - HW_COMPAT_2_1, + HW_COMPAT_2_1 { /* end of list */ } }, }; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 644689a..5f67e17 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1829,7 +1829,7 @@ static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); static GlobalProperty compat_props[] = { - HW_COMPAT_2_1, + HW_COMPAT_2_1 SPAPR_COMPAT_2_1, { /* end of list */ } }; diff --git a/include/hw/compat.h b/include/hw/compat.h index 313682a..c56a698 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -30,6 +30,6 @@ .driver = "virtio-pci",\ .property = "virtio-pci-bus-master-bug-migration",\ .value = "on",\ - } + }, #endif /* HW_COMPAT_H */ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 7ed43f1..7673a4d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -296,7 +296,7 @@ int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); #define PC_COMPAT_2_0 \ - HW_COMPAT_2_1, \ + HW_COMPAT_2_1 \ {\ .driver = "virtio-scsi-pci",\ .property = "any_layout",\