From patchwork Mon May 11 20:55:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 471039 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 F30D21400A0 for ; Tue, 12 May 2015 07:00:01 +1000 (AEST) Received: from localhost ([::1]:39659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrunv-0003tj-Ug for incoming@patchwork.ozlabs.org; Mon, 11 May 2015 16:59:59 -0400 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4BKuLGN026096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 11 May 2015 16:56:21 -0400 Received: from localhost (ovpn-113-174.phx2.redhat.com [10.3.113.174]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4BKuKkD011097; Mon, 11 May 2015 16:56:20 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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 07/13] spapr: Use HW_COMPAT_* 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 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 */ } };