From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrukQ-0004jw-Su for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrukQ-0005KF-1F for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrukP-0005Jw-RF for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:21 -0400 From: Eduardo Habkost Date: Mon, 11 May 2015 17:55:50 -0300 Message-Id: <1431377756-19579-8-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> Subject: [Qemu-devel] [PATCH 07/13] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf , "Michael S. Tsirkin" SPAPR_COMPAT_2_1 will need to include both HW_COMPAT_2_2 and HW_COMPAT_2_1, so include HW_COMPAT_2_1 inside SPAPR_COMPAT_2_1 and HW_COMPAT_2_2 inside SPAPR_COMPAT_2_2. Signed-off-by: Eduardo Habkost --- hw/ppc/spapr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index baad70e..84d1d81 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1816,6 +1816,7 @@ static const TypeInfo spapr_machine_info = { }; #define SPAPR_COMPAT_2_2 \ + HW_COMPAT_2_2 \ {\ .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ .property = "mem_win_size",\ @@ -1823,13 +1824,13 @@ static const TypeInfo spapr_machine_info = { }, #define SPAPR_COMPAT_2_1 \ - SPAPR_COMPAT_2_2 + SPAPR_COMPAT_2_2 \ + HW_COMPAT_2_1 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 { /* end of list */ } }; -- 2.1.0