From patchwork Mon Jan 11 04:37:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 565605 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 972F11402F0 for ; Mon, 11 Jan 2016 15:41:26 +1100 (AEDT) Received: from localhost ([::1]:51333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUIG-0008CY-8D for incoming@patchwork.ozlabs.org; Sun, 10 Jan 2016 23:41:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUE1-0007oG-IU for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIUE0-0004Sf-6R for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:01 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:58918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUDz-0004Qd-QA; Sun, 10 Jan 2016 23:37:00 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 0BD6F140BB8; Mon, 11 Jan 2016 15:36:50 +1100 (AEDT) From: David Gibson To: peter.maydell@linaro.org, mdroth@linux.vnet.ibm.com, aik@ozlabs.ru Date: Mon, 11 Jan 2016 15:37:35 +1100 Message-Id: <1452487058-17182-14-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> References: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2401:3900:2:1::2 Cc: lvivier@redhat.com, thuth@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PULL 13/16] pseries: Add pseries-2.6 machine type 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 Signed-off-by: David Gibson Reviewed-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 8b8eb18..7f6b118 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2337,18 +2337,36 @@ static const TypeInfo spapr_machine_info = { machine_init(spapr_machine_register_##suffix) /* + * pseries-2.6 + */ +static void spapr_machine_2_6_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_2_6_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(2_6, "2.6", true); + +/* * pseries-2.5 */ +#define SPAPR_COMPAT_2_5 \ + HW_COMPAT_2_5 + static void spapr_machine_2_5_instance_options(MachineState *machine) { } static void spapr_machine_2_5_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_2_6_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5); } -DEFINE_SPAPR_MACHINE(2_5, "2.5", true); +DEFINE_SPAPR_MACHINE(2_5, "2.5", false); /* * pseries-2.4