From nobody Mon Feb 9 22:37:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493190349298517.7104168914265; Wed, 26 Apr 2017 00:05:49 -0700 (PDT) Received: from localhost ([::1]:53008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3H1I-0000hP-3c for importer@patchew.org; Wed, 26 Apr 2017 03:05:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3Gwb-0005Cw-Qg for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3GwW-0007vI-CX for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:00:57 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:38811) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3GwV-0007uE-Vj; Wed, 26 Apr 2017 03:00:52 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wCWF65mKSz9s78; Wed, 26 Apr 2017 17:00:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1493190042; bh=KM6GKe3V9kc3aeYQ1z/7oHhGN0pUvyJT3tU32ZBsKA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8t6Fu8H1R7I25K3juKA57OV5nBT2eUw1xzA002xRS8n2oeC0X0BiPJrlSCqjpoGq e0StPyB0+JNuiptrcVVBtfaWMqN6DXaYb4z64wdQyALA8mo3Mqgrk7aWWWOqWKVWf1 4cI2eI3DTkPpfOewBfxkp4zcaI7OhUPLnZkQDa60= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 26 Apr 2017 16:59:48 +1000 Message-Id: <20170426070034.10727-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170426070034.10727-1-david@gibson.dropbear.id.au> References: <20170426070034.10727-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 02/48] pseries: Add pseries-2.10 machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: David Gibson --- hw/ppc/spapr.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 35db949..de5db75 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3158,18 +3158,37 @@ static const TypeInfo spapr_machine_info =3D { type_init(spapr_machine_register_##suffix) =20 /* + * pseries-2.10 + */ +static void spapr_machine_2_10_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_2_10_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(2_10, "2.10", true); + +/* * pseries-2.9 */ +#define SPAPR_COMPAT_2_9 \ + HW_COMPAT_2_9 + static void spapr_machine_2_9_instance_options(MachineState *machine) { + spapr_machine_2_10_instance_options(machine); } =20 static void spapr_machine_2_9_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_2_10_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_9); } =20 -DEFINE_SPAPR_MACHINE(2_9, "2.9", true); +DEFINE_SPAPR_MACHINE(2_9, "2.9", false); =20 /* * pseries-2.8 --=20 2.9.3