From patchwork Sun May 31 18:34:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 478681 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 303A2140E62 for ; Mon, 1 Jun 2015 04:43:21 +1000 (AEST) Received: from localhost ([::1]:42943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz8Cd-00033U-5a for incoming@patchwork.ozlabs.org; Sun, 31 May 2015 14:43:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz84N-00053X-E0 for qemu-devel@nongnu.org; Sun, 31 May 2015 14:34:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yz84M-00049s-M2 for qemu-devel@nongnu.org; Sun, 31 May 2015 14:34:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz84M-00049o-Hm; Sun, 31 May 2015 14:34:46 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 30AE9379E5C; Sun, 31 May 2015 18:34:46 +0000 (UTC) Received: from redhat.com (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t4VIYhOR019719; Sun, 31 May 2015 14:34:44 -0400 Date: Sun, 31 May 2015 20:34:43 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1433097192-8988-8-git-send-email-mst@redhat.com> References: <1433097192-8988-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1433097192-8988-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , qemu-ppc@nongnu.org, Eduardo Habkost , Alexander Graf Subject: [Qemu-devel] [PULL 07/57] spapr: Move commas inside SPAPR_COMPAT_* macros 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: 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 --- hw/ppc/spapr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f768de1..ee0ec61 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1820,7 +1820,7 @@ static const TypeInfo spapr_machine_info = { .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ .property = "mem_win_size",\ .value = "0x20000000",\ - } + }, #define SPAPR_COMPAT_2_1 \ SPAPR_COMPAT_2_2 @@ -1862,7 +1862,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 - SPAPR_COMPAT_2_1, + SPAPR_COMPAT_2_1 { /* end of list */ } }; @@ -1881,7 +1881,7 @@ static const TypeInfo spapr_machine_2_1_info = { static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data) { static GlobalProperty compat_props[] = { - SPAPR_COMPAT_2_2, + SPAPR_COMPAT_2_2 { /* end of list */ } }; MachineClass *mc = MACHINE_CLASS(oc);