From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLOP4-0002Yi-5z for qemu-devel@nongnu.org; Fri, 08 Jul 2016 01:32:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLOP1-0007Rb-R9 for qemu-devel@nongnu.org; Fri, 08 Jul 2016 01:32:41 -0400 Date: Fri, 8 Jul 2016 15:19:58 +1000 From: David Gibson Message-ID: <20160708051958.GK14675@voom.fritz.box> References: <1467903025-13383-1-git-send-email-bharata@linux.vnet.ibm.com> <1467903025-13383-3-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Tw5XVHq4jmAOFG53" Content-Disposition: inline In-Reply-To: <1467903025-13383-3-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v2 2/5] cpu: Introduce CPUState::stable_cpu_id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, imammedo@redhat.com, groug@kaod.org, nikunj@linux.vnet.ibm.com, pbonzini@redhat.com --Tw5XVHq4jmAOFG53 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 07, 2016 at 08:20:22PM +0530, Bharata B Rao wrote: > Add CPUState::stable_cpu_id and use that as instance_id in > vmstate_register() call. >=20 > Introduce has-stable_cpu_id property that allows target machines to > optionally switch to using stable_cpu_id instead of cpu_index. > This will help allow successful migration in cases where holes are > introduced in cpu_index range after CPU hot removals. >=20 > Suggested-by: Igor Mammedov > Signed-off-by: Bharata B Rao > --- > exec.c | 6 ++++-- > include/qom/cpu.h | 5 +++++ > qom/cpu.c | 6 ++++++ > 3 files changed, 15 insertions(+), 2 deletions(-) >=20 > diff --git a/exec.c b/exec.c > index fb73910..3b36fe5 100644 > --- a/exec.c > +++ b/exec.c > @@ -619,12 +619,14 @@ static void cpu_release_index(CPUState *cpu) > void cpu_vmstate_register(CPUState *cpu) > { > CPUClass *cc =3D CPU_GET_CLASS(cpu); > + int instance_id =3D cpu->has_stable_cpu_id ? cpu->stable_cpu_id : > + cpu->cpu_index; > =20 > if (qdev_get_vmsd(DEVICE(cpu)) =3D=3D NULL) { > - vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu); > + vmstate_register(NULL, instance_id, &vmstate_cpu_common, cpu); > } > if (cc->vmsd !=3D NULL) { > - vmstate_register(NULL, cpu->cpu_index, cc->vmsd, cpu); > + vmstate_register(NULL, instance_id, cc->vmsd, cpu); > } > } > =20 > diff --git a/include/qom/cpu.h b/include/qom/cpu.h > index 331386f..527c021 100644 > --- a/include/qom/cpu.h > +++ b/include/qom/cpu.h > @@ -273,6 +273,9 @@ struct qemu_work_item { > * @kvm_fd: vCPU file descriptor for KVM. > * @work_mutex: Lock to prevent multiple access to queued_work_*. > * @queued_work_first: First asynchronous work pending. > + * @stable_cpu_id: Use as instance_id argument in cpu vmstate_register c= alls > + * @has_stable_cpu_id: Set to enforce the use of @stable_cpu_id > + * over cpu_index during vmstate registration. > * > * State of one CPU core or thread. > */ > @@ -360,6 +363,8 @@ struct CPUState { > (absolute value) offset as small as possible. This reduces code > size, especially for hosts without large memory offsets. */ > uint32_t tcg_exit_req; > + int stable_cpu_id; > + bool has_stable_cpu_id; > }; > =20 > QTAILQ_HEAD(CPUTailQ, CPUState); > diff --git a/qom/cpu.c b/qom/cpu.c > index 1095ea1..bae1bf7 100644 > --- a/qom/cpu.c > +++ b/qom/cpu.c > @@ -363,6 +363,11 @@ static int64_t cpu_common_get_arch_id(CPUState *cpu) > return cpu->cpu_index; > } > =20 > +static Property cpu_common_properties[] =3D { > + DEFINE_PROP_BOOL("has-stable-cpu-id", CPUState, has_stable_cpu_id, f= alse), It seems odd to me that stable_cpu_id itself isn't exposed as a property. Even if we don't need to set it externally for now, it really should be QOM introspectable. > + DEFINE_PROP_END_OF_LIST() > +}; > + > static void cpu_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc =3D DEVICE_CLASS(klass); > @@ -394,6 +399,7 @@ static void cpu_class_init(ObjectClass *klass, void *= data) > * IRQs, adding reset handlers, halting non-first CPUs, ... > */ > dc->cannot_instantiate_with_device_add_yet =3D true; > + dc->props =3D cpu_common_properties; > } > =20 > static const TypeInfo cpu_type_info =3D { --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --Tw5XVHq4jmAOFG53 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXfzf+AAoJEGw4ysog2bOSxf8QAIBvl3kN//wxD+nkgWawRiW9 3Xoa6jvAi/nIFgbyFzbSdkhgWQnI6CImRs1HNc7zmoPsnb/Gdn5SH9PzsL3NGa7Y 46sNR3k78Vr9jvU5zOBFvLy7a0DBBO+Zx3ww32qTF5Gs9t5TxfRRO3xvHv5+n4yJ XUn+OePdupjtTBmwxTPqqxttWXFP7Im4oSH28S08iwMSYsDjdO7ZfxAR4i8MdyPF EPY/tqI6YHS5Hrx6SWVIwExy1MZWOtasn1TL/WUG+omAlJ8/g/gOQ1j1eg9iOEkC Sl6COOqwm5HZrA+wV3FrEoi4H6PtoPBDVgbQip9Oh9dR3Oa3BSeqIUaPKDhZic6s LNIFLIWaL4mXiC2emIV3NSznx3mHgleEI6l68j45IEjzZLhXwqKeexd+quNjIBRl wXcXregBrVFV0GAuPv3YswoeiLWwi4+KBlChCpUlRSKvmkZ28/6HDp6IPHhu3wfA RaNwOy+tfX4PuJBBWHqnYwGv0UAZI9Nbc2c3KfPeF145nq/iMNmfLDYZnIcLWJHd i4N681bzq1so4tdCoIG06yadjNxrVxCUQ6XkkFzXHa3Q68wyPwHKVcv2n+37k9JG IdWmwwkajS2C4ozjD5PGntdC82t30CIPbXmphO4E6/g0DjVKmhmRVuAS/NowmYO/ 6vRbc6KPgc5ASHv9eyia =mKzH -----END PGP SIGNATURE----- --Tw5XVHq4jmAOFG53--