From patchwork Tue Jun 7 10:47:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 631483 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 3rP8Bm6dz9z9t4Z for ; Tue, 7 Jun 2016 21:16:00 +1000 (AEST) 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=azOWxuye; dkim-atps=neutral Received: from localhost ([::1]:48607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAEzG-0006Ea-Ui for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2016 07:15:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAEYe-0006yf-Kb for qemu-devel@nongnu.org; Tue, 07 Jun 2016 06:48:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAEYX-00055y-Em for qemu-devel@nongnu.org; Tue, 07 Jun 2016 06:48:27 -0400 Received: from ozlabs.org ([103.22.144.67]:35499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAEYX-00054S-4a; Tue, 07 Jun 2016 06:48:21 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3rP7Zn54Kwz9t5n; Tue, 7 Jun 2016 20:48:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1465296497; bh=3FHnzddcjSNIaKRyv0uGXlxMPQyWGIv1c10L2cvAEJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=azOWxuyetiKK7k6gN7kvvVZiR0/hP3FalQfaa/mupQHuieeqDHU7k4glv3NFZzZV2 hs65O7vkW0FUhzMpotcCIwShDizrXPXT/RnEl7Cq8U9QXFYcpaYGKTt/brVphFx7vK TxwOCxaqELfUPPPS9xAk3m0eBQAkQvufK+yYY7oo= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 7 Jun 2016 20:47:57 +1000 Message-Id: <1465296493-10851-11-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465296493-10851-1-git-send-email-david@gibson.dropbear.id.au> References: <1465296493-10851-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: 103.22.144.67 Subject: [Qemu-devel] [PULL 10/26] spapr: Introduce pseries-2.7 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: Bharata B Rao , qemu-ppc@nongnu.org, agraf@suse.de, David Gibson , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Bharata B Rao Signed-off-by: Bharata B Rao Signed-off-by: David Gibson --- 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 14cc6ae..0636642 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2354,18 +2354,36 @@ static const TypeInfo spapr_machine_info = { type_init(spapr_machine_register_##suffix) /* + * pseries-2.7 + */ +static void spapr_machine_2_7_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_2_7_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(2_7, "2.7", true); + +/* * pseries-2.6 */ +#define SPAPR_COMPAT_2_6 \ + HW_COMPAT_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 */ + spapr_machine_2_7_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6); } -DEFINE_SPAPR_MACHINE(2_6, "2.6", true); +DEFINE_SPAPR_MACHINE(2_6, "2.6", false); /* * pseries-2.5