From nobody Wed Oct 29 09:27:13 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 1524822755541517.9637156410528; Fri, 27 Apr 2018 02:52:35 -0700 (PDT) Received: from localhost ([::1]:46859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC03O-00053C-Is for importer@patchew.org; Fri, 27 Apr 2018 05:52:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBzac-0002EW-7O for qemu-devel@nongnu.org; Fri, 27 Apr 2018 05:22:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBzaa-0002L7-Nn for qemu-devel@nongnu.org; Fri, 27 Apr 2018 05:22:50 -0400 Received: from ozlabs.org ([203.11.71.1]:53855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBzaa-0002K9-Bf; Fri, 27 Apr 2018 05:22:48 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 40XT2q4d37z9s7F; Fri, 27 Apr 2018 19:21:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1524820899; bh=OYCEiq1c1YklEvqiDznXy/hVwFpWCOQCqRi0tdGr/Oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OUmxf9V8LjABaENvbLTYcIUeM9YTCD9omZnOuF13pA/Ol+58jrx4XBIdKYNw/CW8D 5LMdi8TnpSGqoQRiMch9UcpqEOSHEJeavqqAy/A3QWNLvvVcRo1bXIrP+86HxaxcSt p/R57yh/hnf44YfvHSoEh6xk/y0tYKtI0wguneYs= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 27 Apr 2018 19:21:02 +1000 Message-Id: <20180427092126.24812-26-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180427092126.24812-1-david@gibson.dropbear.id.au> References: <20180427092126.24812-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 25/49] spapr: Introduce pseries-2.13 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: David Gibson , qemu-ppc@nongnu.org, groug@kaod.org, qemu-devel@nongnu.org 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 +++++++++++++++++++++-- include/hw/compat.h | 2 ++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 92194a9a53..b92dad2273 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3984,19 +3984,38 @@ static const TypeInfo spapr_machine_info =3D { } \ type_init(spapr_machine_register_##suffix) =20 +/* + * pseries-2.13 + */ +static void spapr_machine_2_13_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_2_13_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(2_13, "2.13", true); + /* * pseries-2.12 */ +#define SPAPR_COMPAT_2_12 \ + HW_COMPAT_2_12 + static void spapr_machine_2_12_instance_options(MachineState *machine) { + spapr_machine_2_13_instance_options(machine); } =20 static void spapr_machine_2_12_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_2_13_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_12); } =20 -DEFINE_SPAPR_MACHINE(2_12, "2.12", true); +DEFINE_SPAPR_MACHINE(2_12, "2.12", false); =20 static void spapr_machine_2_12_sxxm_instance_options(MachineState *machine) { diff --git a/include/hw/compat.h b/include/hw/compat.h index 13242b831a..4681c2719a 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,8 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H =20 +#define HW_COMPAT_2_12 + #define HW_COMPAT_2_11 \ {\ .driver =3D "hpet",\ --=20 2.14.3