From patchwork Mon Jul 30 14:11:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 951006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kaod.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 41fM366Tqmz9rxx for ; Tue, 31 Jul 2018 00:12:34 +1000 (AEST) Received: from localhost ([::1]:52843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8uW-0004qU-Da for incoming@patchwork.ozlabs.org; Mon, 30 Jul 2018 10:12:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8tw-0004ou-GL for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:11:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8tr-0005W9-OH for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:11:56 -0400 Received: from 5.mo7.mail-out.ovh.net ([178.32.120.239]:56948) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8tr-0005VW-H4 for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:11:51 -0400 Received: from player787.ha.ovh.net (unknown [10.109.159.69]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id AF9D8C1D46 for ; Mon, 30 Jul 2018 16:11:49 +0200 (CEST) Received: from zorba.kaod.org.com (bad36-1-78-202-132-1.fbx.proxad.net [78.202.132.1]) (Authenticated sender: clg@kaod.org) by player787.ha.ovh.net (Postfix) with ESMTPSA id 2F8F16000C7; Mon, 30 Jul 2018 16:11:44 +0200 (CEST) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: David Gibson Date: Mon, 30 Jul 2018 16:11:31 +0200 Message-Id: <20180730141134.31153-2-clg@kaod.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141134.31153-1-clg@kaod.org> References: <20180730141134.31153-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 2064056008270646246 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtiedrkeejgdejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.32.120.239 Subject: [Qemu-devel] [PATCH v6 1/4] 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: =?utf-8?q?C=C3=A9dric_Le_Goater?= , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Greg Kurz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Cédric Le Goater Reviewed-by: Greg Kurz --- include/hw/compat.h | 3 +++ hw/ppc/spapr.c | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index c08f4040bb80..6f4d5fc64704 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_3_0 \ + /* empty */ + #define HW_COMPAT_2_12 \ {\ .driver = "migration",\ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 421b2dd09b51..3c72173c7e0f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4058,19 +4058,38 @@ static const TypeInfo spapr_machine_info = { } \ type_init(spapr_machine_register_##suffix) + /* + * 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); } 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); } -DEFINE_SPAPR_MACHINE(3_0, "3.0", true); +DEFINE_SPAPR_MACHINE(3_0, "3.0", false); /* * pseries-2.12