From patchwork Thu Jul 7 14:50:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 9219087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 10A6160467 for ; Thu, 7 Jul 2016 14:59:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F21EB27D9B for ; Thu, 7 Jul 2016 14:59:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3EB727E33; Thu, 7 Jul 2016 14:59:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 407B127D9B for ; Thu, 7 Jul 2016 14:59:37 +0000 (UTC) Received: from localhost ([::1]:40449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAm8-0003j6-Fg for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Jul 2016 10:59:36 -0400 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 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 8 Jul 2016 00:50:46 +1000 X-IBM-Helo: d23dlp02.au.ibm.com X-IBM-MailFrom: bharata@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from d23relay08.au.ibm.com (d23relay08.au.ibm.com [9.185.71.33]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 35D952BB0057; Fri, 8 Jul 2016 00:50:46 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay08.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u67EokD27471490; Fri, 8 Jul 2016 00:50:46 +1000 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u67EojTA019280; Fri, 8 Jul 2016 00:50:46 +1000 Received: from bharata.in.ibm.com ([9.77.202.64]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u67EoRp6018946; Fri, 8 Jul 2016 00:50:43 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2016 20:20:25 +0530 X-Mailer: git-send-email 2.7.4 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> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16070714-0040-0000-0000-000001BE1DB9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16070714-0041-0000-0000-00000A07D16A Message-Id: <1467903025-13383-6-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-07_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607070136 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v2 5/5] spapr: Enable the use of stable_cpu_id from pseries-2.7 onwards 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: nikunj@linux.vnet.ibm.com, Bharata B Rao , groug@kaod.org, qemu-ppc@nongnu.org, pbonzini@redhat.com, imammedo@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 */