From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gudf7-0000wo-Dw for qemu-devel@nongnu.org; Fri, 15 Feb 2019 08:36:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gudf5-0000Gm-8c for qemu-devel@nongnu.org; Fri, 15 Feb 2019 08:36:17 -0500 Received: from 1.mo6.mail-out.ovh.net ([46.105.56.136]:41455) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gudf3-0000A3-Nl for qemu-devel@nongnu.org; Fri, 15 Feb 2019 08:36:14 -0500 Received: from player791.ha.ovh.net (unknown [10.109.143.209]) by mo6.mail-out.ovh.net (Postfix) with ESMTP id F39621AC856 for ; Fri, 15 Feb 2019 14:36:04 +0100 (CET) Date: Fri, 15 Feb 2019 14:35:59 +0100 From: Greg Kurz Message-ID: <20190215143559.450991dd@bahia.lan> In-Reply-To: <2237cc20-ffcd-4a9b-944a-392520127432@kaod.org> References: <155023078266.1011724.5995737218088270486.stgit@bahia.lan> <155023081228.1011724.12474992370439652538.stgit@bahia.lan> <4690ad87-f634-4f3b-a39c-ee61bfc64e75@kaod.org> <20190215141824.3549d285@bahia.lan> <2237cc20-ffcd-4a9b-944a-392520127432@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 05/10] xics: Drop the KVM ICP class List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?Q8OpZHJpYw==?= Le Goater Cc: David Gibson , qemu-devel@nongnu.org, qemu-ppc@nongnu.org On Fri, 15 Feb 2019 14:35:03 +0100 C=C3=A9dric Le Goater wrote: > On 2/15/19 2:18 PM, Greg Kurz wrote: > > On Fri, 15 Feb 2019 13:55:53 +0100 > > C=C3=A9dric Le Goater wrote: > > =20 > >> On 2/15/19 12:40 PM, Greg Kurz wrote: =20 > >>> The KVM ICP class isn't used anymore. Drop it. =20 > >> > >> Isn't migration complaining ? If not, > >> =20 > >=20 > > Hm.. no, but why would migration complain ? =20 >=20 > You are changing the type name of the object being transferred: >=20 > "icp-kcm" -> "icp" >=20 AFAIK type names aren't part of the vmstate description. > Isn't that an issue ?=20 >=20 > C. >=20 > > =20 > >> Reviewed-by: C=C3=A9dric Le Goater > >> > >> Thanks, > >> > >> C. > >> > >> > >> =20 > >>> Signed-off-by: Greg Kurz > >>> --- > >>> hw/intc/xics_kvm.c | 18 ------------------ > >>> include/hw/ppc/xics.h | 3 --- > >>> 2 files changed, 21 deletions(-) > >>> > >>> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c > >>> index 4eebced516b6..fae4ac431f2f 100644 > >>> --- a/hw/intc/xics_kvm.c > >>> +++ b/hw/intc/xics_kvm.c > >>> @@ -152,23 +152,6 @@ void icp_kvm_realize(DeviceState *dev, Error **e= rrp) > >>> QLIST_INSERT_HEAD(&kvm_enabled_icps, enabled_icp, node); > >>> } > >>> =20 > >>> -static void icp_kvm_class_init(ObjectClass *klass, void *data) > >>> -{ > >>> - DeviceClass *dc =3D DEVICE_CLASS(klass); > >>> - ICPStateClass *icpc =3D ICP_CLASS(klass); > >>> - > >>> - device_class_set_parent_realize(dc, icp_kvm_realize, > >>> - &icpc->parent_realize); > >>> -} > >>> - > >>> -static const TypeInfo icp_kvm_info =3D { > >>> - .name =3D TYPE_KVM_ICP, > >>> - .parent =3D TYPE_ICP, > >>> - .instance_size =3D sizeof(ICPState), > >>> - .class_init =3D icp_kvm_class_init, > >>> - .class_size =3D sizeof(ICPStateClass), > >>> -}; > >>> - > >>> /* > >>> * ICS-KVM > >>> */ > >>> @@ -425,7 +408,6 @@ fail: > >>> static void xics_kvm_register_types(void) > >>> { > >>> type_register_static(&ics_kvm_info); > >>> - type_register_static(&icp_kvm_info); > >>> } > >>> =20 > >>> type_init(xics_kvm_register_types) > >>> diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > >>> index ab61dc24010a..fae54e6f28ae 100644 > >>> --- a/include/hw/ppc/xics.h > >>> +++ b/include/hw/ppc/xics.h > >>> @@ -50,9 +50,6 @@ typedef struct XICSFabric XICSFabric; > >>> #define TYPE_ICP "icp" > >>> #define ICP(obj) OBJECT_CHECK(ICPState, (obj), TYPE_ICP) > >>> =20 > >>> -#define TYPE_KVM_ICP "icp-kvm" > >>> -#define KVM_ICP(obj) OBJECT_CHECK(ICPState, (obj), TYPE_KVM_ICP) > >>> - > >>> #define TYPE_PNV_ICP "pnv-icp" > >>> #define PNV_ICP(obj) OBJECT_CHECK(PnvICPState, (obj), TYPE_PNV_ICP) > >>> =20 > >>> =20 > >> =20 > > =20 >=20