From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAdl-0001CK-1u for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:50:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLAdh-0007R7-3E for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:50:56 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:13275 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAdg-0007Qx-Su for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:50:53 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u67En6ek054597 for ; Thu, 7 Jul 2016 10:50:52 -0400 Received: from e23smtp06.au.ibm.com (e23smtp06.au.ibm.com [202.81.31.148]) by mx0b-001b2d01.pphosted.com with ESMTP id 2415xmpuce-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 07 Jul 2016 10:50:52 -0400 Received: from localhost by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 8 Jul 2016 00:50:49 +1000 From: Bharata B Rao Date: Thu, 7 Jul 2016 20:20:25 +0530 In-Reply-To: <1467903025-13383-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1467903025-13383-1-git-send-email-bharata@linux.vnet.ibm.com> Message-Id: <1467903025-13383-6-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v2 5/5] spapr: Enable the use of stable_cpu_id from pseries-2.7 onwards List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, imammedo@redhat.com, groug@kaod.org, nikunj@linux.vnet.ibm.com, pbonzini@redhat.com, Bharata B Rao Starting from pseries-2.7, turn on has-stable-cpu-id property that switches to using stable_cpu_id over cpu_index for cpu vmstate registration and in XICS code. This allows migration to work when CPU cores are not necessarily unplugged in LIFO order. Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 14 ++++++++++++++ include/hw/compat.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 89e61b9..4ca6072 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2495,6 +2495,14 @@ static const TypeInfo spapr_machine_info = { /* * pseries-2.7 */ +#define SPAPR_COMPAT_2_7 \ + HW_COMPAT_2_7 \ + { \ + .driver = TYPE_CPU, \ + .property = "has-stable-cpu-id", \ + .value = "on", \ + }, + static void spapr_machine_2_7_instance_options(MachineState *machine) { } @@ -2502,6 +2510,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 */ + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_7); } DEFINE_SPAPR_MACHINE(2_7, "2.7", true); @@ -2515,6 +2524,11 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", true); .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ .property = "ddw",\ .value = stringify(off),\ + }, \ + { \ + .driver = TYPE_CPU, \ + .property = "has-stable-cpu-id", \ + .value = "off", \ }, static void spapr_machine_2_6_instance_options(MachineState *machine) diff --git a/include/hw/compat.h b/include/hw/compat.h index 636befe..8e639e2 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_7 \ + /* empty */ + #define HW_COMPAT_2_6 \ /* empty */ -- 2.7.4