From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOjt-0005XL-KS for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:22:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzOjs-0007LH-LQ for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:22:45 -0400 Date: Mon, 1 Jun 2015 14:22:40 +0200 From: "Michael S. Tsirkin" Message-ID: <1433161230-29421-6-git-send-email-mst@redhat.com> References: <1433161230-29421-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433161230-29421-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 05/60] hw: Move commas inside HW_COMPAT_2_1 macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , Richard Henderson From: Eduardo Habkost 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/compat.h | 2 +- include/hw/i386/pc.h | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/ppc/spapr.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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",\ diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a8ff6f5..608539d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -562,7 +562,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 e67f2de..36b8834 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -458,7 +458,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 ac261ef..f768de1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1861,7 +1861,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 */ } }; -- MST