From nobody Wed Nov 5 14:25:39 2025 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.zohomail.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 1534826736258500.5725869163999; Mon, 20 Aug 2018 21:45:36 -0700 (PDT) Received: from localhost ([::1]:50702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fryXv-0007ng-4e for importer@patchew.org; Tue, 21 Aug 2018 00:45:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fryMt-0004Bi-P2 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 00:34:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fryMo-0000Ml-W7 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 00:34:09 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:60951) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fryMk-0000GM-U7; Tue, 21 Aug 2018 00:34:05 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 41vd9F0p67z9s8f; Tue, 21 Aug 2018 14:33:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1534826033; bh=uciFBlGatMEUkqF6tTQr0suQZ+RyRE/ds8s6olSC0lw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fPHwnQltKx9RiWsngECNTRtvzS9qG1STnJyjPFq8ia+5fztwKoBR2n7ZlKc1d4YC9 heCncFx/pqfHvImiTJNuoBTNgKlb/ke476q2RIkkCRSgur2GoD7oGuTlf2oK573zdm pVzjMAo3SDYIUP2yhOcsMXWpAiWSVPqrRFxu56KU= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 21 Aug 2018 14:33:31 +1000 Message-Id: <20180821043343.7514-15-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821043343.7514-1-david@gibson.dropbear.id.au> References: <20180821043343.7514-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 14/26] spapr: Add a pseries-3.1 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: lvivier@redhat.com, aik@ozlabs.ru, groug@kaod.org, qemu-devel@nongnu.org, 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-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz 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 e5d825374e..a732f59205 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4059,19 +4059,38 @@ static const TypeInfo spapr_machine_info =3D { } \ type_init(spapr_machine_register_##suffix) =20 + /* + * pseries-3.1 + */ +static void spapr_machine_3_1_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_3_1_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(3_1, "3.1", true); + /* * pseries-3.0 */ +#define SPAPR_COMPAT_3_0 \ + HW_COMPAT_3_0 + static void spapr_machine_3_0_instance_options(MachineState *machine) { + spapr_machine_3_1_instance_options(machine); } =20 static void spapr_machine_3_0_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_3_1_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_0); } =20 -DEFINE_SPAPR_MACHINE(3_0, "3.0", true); +DEFINE_SPAPR_MACHINE(3_0, "3.0", false); =20 /* * pseries-2.12 --=20 2.17.1