From patchwork Fri Dec 9 02:23:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 704287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tZbg72ZqYz9tld for ; Fri, 9 Dec 2016 13:25:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="El+2Yz0Z"; dkim-atps=neutral Received: from localhost ([::1]:44262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFAsD-0006Vt-8r for incoming@patchwork.ozlabs.org; Thu, 08 Dec 2016 21:25:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFAqr-0002J2-Gd for qemu-devel@nongnu.org; Thu, 08 Dec 2016 21:23:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFAqo-0008Cx-D7 for qemu-devel@nongnu.org; Thu, 08 Dec 2016 21:23:57 -0500 Received: from ozlabs.org ([103.22.144.67]:42661) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cFAqo-0008CQ-1m; Thu, 08 Dec 2016 21:23:54 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3tZbck2VVgz9vDt; Fri, 9 Dec 2016 13:23:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1481250198; bh=Kh6QH+4fbjH/C61oWfo5w5eF8sha1eJcNWoy2+FORnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=El+2Yz0ZvHMQbyDvXMObG2u2C1yQoUJwFb6O9X10sSViydCzi/0B0tpTN6U1Lz31o cWvXucx25x5gahjgXkvFwaZIKzHlATFXsQ4+vlPbqzqt0wZJ22nzUbJ+ijpfwa5nRk fCbugkf3LM1E1Me7BStXTRalyIyB8nrGhQyql4RU= From: David Gibson To: paulus@samba.org, sjitindarsingh@gmail.com Date: Fri, 9 Dec 2016 13:23:10 +1100 Message-Id: <20161209022314.14399-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161209022314.14399-1-david@gibson.dropbear.id.au> References: <20161209022314.14399-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: 103.22.144.67 Subject: [Qemu-devel] [for-2.9 1/5] pseries: Add pseries-2.9 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, thuth@redhat.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Laurent Vivier --- hw/ppc/spapr.c | 23 +++++++++++++++++++++-- include/hw/compat.h | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index cfadc46..0f25e83 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2761,18 +2761,37 @@ static const TypeInfo spapr_machine_info = { type_init(spapr_machine_register_##suffix) /* + * pseries-2.9 + */ +static void spapr_machine_2_9_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_2_9_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(2_9, "2.9", true); + +/* * pseries-2.8 */ +#define SPAPR_COMPAT_2_8 \ + HW_COMPAT_2_8 + static void spapr_machine_2_8_instance_options(MachineState *machine) { + spapr_machine_2_9_instance_options(machine); } static void spapr_machine_2_8_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_2_9_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_8); } -DEFINE_SPAPR_MACHINE(2_8, "2.8", true); +DEFINE_SPAPR_MACHINE(2_8, "2.8", false); /* * pseries-2.7 diff --git a/include/hw/compat.h b/include/hw/compat.h index 0f06e11..f8b8354 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_2_8 \ + /* empty */ + #define HW_COMPAT_2_7 \ {\ .driver = "virtio-pci",\