From patchwork Wed Dec 23 19:33:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 560692 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 B5E0C140B9A for ; Thu, 24 Dec 2015 06:34:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ravellosystems-com.20150623.gappssmtp.com header.i=@ravellosystems-com.20150623.gappssmtp.com header.b=uNiiw10Z; dkim-atps=neutral Received: from localhost ([::1]:57574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBpAl-0004gq-Eo for incoming@patchwork.ozlabs.org; Wed, 23 Dec 2015 14:34:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBpAW-0004La-QK for qemu-devel@nongnu.org; Wed, 23 Dec 2015 14:33:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBpAT-0006J2-UN for qemu-devel@nongnu.org; Wed, 23 Dec 2015 14:33:52 -0500 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBpAS-0006Io-K8 for qemu-devel@nongnu.org; Wed, 23 Dec 2015 14:33:49 -0500 Received: by mail-wm0-x22c.google.com with SMTP id l126so157926189wml.1 for ; Wed, 23 Dec 2015 11:33:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravellosystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=KyIbwYDpA4S2M/inhWVidlilCXvvr8Dk8H6og3dkUjM=; b=uNiiw10ZgeQzlAZ5vvJWsrrBeyDKDglNqLN7TibgO6hDkZYAzLJpf8M3NvHhWs11nV P3nJVtbL5+ZqjTjvT9D0QB5ImsURczoEM1fr+fCma7a35LB000omkAAwj0SaE84KBMkx Sl9BIZX2IBVz6mwdACGxbzGwCdxr3JT8slOSI9jJp+25AlN7tHFiHfb5rVgjCFw2u9OI K3sg4sT9RmdL8rs++H3tOYyy3rLFmgp4If6FjRq3ECmLxkGJQe4Wpw0aciq0uWe+VoaH 17wcRyiZfY/AXxiSKL56mRLxxdQaRjZ6qGZATARWayKdlh6QPJrM+B3EwtfqbAc0Z1a2 2bvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KyIbwYDpA4S2M/inhWVidlilCXvvr8Dk8H6og3dkUjM=; b=W//oU29fNApxUh5HYApYq3as2S7LExu+4U6Gb0mE/7T1ANl8cHf8vH2s6G0Cq7llAX 8hqu6/SGP6K4E1UQ8BlXaZb+qEpnCC5kc2LGwILXD9BOAscBUnMjxVLoezpZe1J4dMus oWSZDWWluii1Ws93Q4B+TE9kqyj/6z+0qXT7DOLxLlZLDmFe3XwYRoLYMYDIYpnAp4J2 ZFLpdgdQws/igjGiWoNhvnHBDt4ENZwVpUXodGW6YF8aPhP/D4wmvZvpldlbHYBR59IV czsYdMajgfANbKSaqSrdyEWON2DzeZxd1WFGPA5OFZBhZf+9SUbrXRGxo026WXUe7TMg pZtg== X-Gm-Message-State: ALoCoQnr8MVRWkpKDTDQrS7xwDbrYKIKXNzJsUDb6a6CRNEkBcXFHmrPcq+SZZ08MncdJqDX4OkazPVWJqqsZaP+5CXNol7CZQ== X-Received: by 10.28.177.10 with SMTP id a10mr34591229wmf.4.1450899227928; Wed, 23 Dec 2015 11:33:47 -0800 (PST) Received: from honey.ravello.local ([213.57.127.2]) by smtp.gmail.com with ESMTPSA id r10sm14218738wjz.24.2015.12.23.11.33.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 11:33:47 -0800 (PST) From: Shmulik Ladkani To: David Gibson Date: Wed, 23 Dec 2015 21:33:35 +0200 Message-Id: <1450899215-19311-1-git-send-email-shmulik.ladkani@ravellosystems.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22c Cc: Shmulik Ladkani , idan.brown@ravellosystems.com, qemu-ppc@nongnu.org, Alexander Graf , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] spapr: Introduce SPAPR_COMPAT_2_5 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 In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and PC_COMPAT_2_5 were introduced. Accordingly, introduce SPAPR_COMPAT_2_5 that uses HW_COMPAT_2_5. Signed-off-by: Shmulik Ladkani --- hw/ppc/spapr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6bfb908..6a0bfd7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2298,7 +2298,11 @@ static const TypeInfo spapr_machine_info = { }, }; +#define SPAPR_COMPAT_2_5 \ + HW_COMPAT_2_5 + #define SPAPR_COMPAT_2_4 \ + SPAPR_COMPAT_2_5 \ HW_COMPAT_2_4 #define SPAPR_COMPAT_2_3 \ @@ -2434,6 +2438,10 @@ static const TypeInfo spapr_machine_2_4_info = { static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) { + static GlobalProperty compat_props[] = { + SPAPR_COMPAT_2_5 + { /* end of list */ } + }; MachineClass *mc = MACHINE_CLASS(oc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); @@ -2442,6 +2450,7 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) mc->alias = "pseries"; mc->is_default = 1; smc->dr_lmb_enabled = true; + mc->compat_props = compat_props; } static const TypeInfo spapr_machine_2_5_info = {