From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buSjS-0004ce-8w for qemu-devel@nongnu.org; Wed, 12 Oct 2016 19:14:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buSjP-0000XS-27 for qemu-devel@nongnu.org; Wed, 12 Oct 2016 19:14:42 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buSjO-0000Wf-PZ for qemu-devel@nongnu.org; Wed, 12 Oct 2016 19:14:38 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9CNDeG5123082 for ; Wed, 12 Oct 2016 19:14:38 -0400 Received: from e38.co.us.ibm.com (e38.co.us.ibm.com [32.97.110.159]) by mx0a-001b2d01.pphosted.com with ESMTP id 261uw2ppkk-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 12 Oct 2016 19:14:38 -0400 Received: from localhost by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Oct 2016 17:14:37 -0600 From: Michael Roth Date: Wed, 12 Oct 2016 18:13:53 -0500 In-Reply-To: <1476314039-9520-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1476314039-9520-1-git-send-email-mdroth@linux.vnet.ibm.com> Message-Id: <1476314039-9520-6-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 05/11] spapr: fix inheritance chain for default machine options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, david@gibson.dropbear.id.au, nfont@linux.vnet.ibm.com, jallen@linux.vnet.ibm.com Rather than machine instances having backward-compatible option defaults that need to be repeatedly re-enabled for every new machine type we introduce, we set the defaults appropriate for newer machine types, then add code to explicitly disable instance options as needed to maintain compatibility with older machine types. Currently pseries-2.5 does not inherit from pseries-2.6 in this fashion, which is okay at the moment since we do not have any instance compatibility options for pseries-2.6+ currently. We will make use of this in future patches though, so fix it here. Signed-off-by: Michael Roth --- hw/ppc/spapr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3b2a459..f8cde92 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2544,6 +2544,7 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", false); static void spapr_machine_2_6_instance_options(MachineState *machine) { + spapr_machine_2_7_instance_options(machine); } static void spapr_machine_2_6_class_options(MachineClass *mc) @@ -2568,6 +2569,7 @@ DEFINE_SPAPR_MACHINE(2_6, "2.6", false); static void spapr_machine_2_5_instance_options(MachineState *machine) { + spapr_machine_2_6_instance_options(machine); } static void spapr_machine_2_5_class_options(MachineClass *mc) -- 1.9.1