From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUM8d-0006Gi-Ro for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUM8c-000754-J5 for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:10:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUM8c-00074x-A4 for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:10:54 -0400 Date: Mon, 22 Apr 2013 21:10:40 +0200 From: Igor Mammedov Message-ID: <20130422211040.0d8c9cdc@nial.usersys.redhat.com> In-Reply-To: <5175666C.3080808@suse.de> References: <1366063976-4909-1-git-send-email-imammedo@redhat.com> <1366063976-4909-8-git-send-email-imammedo@redhat.com> <5175666C.3080808@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 07/16] cpu: introduce get_arch_id() method and override it for target-i386 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?ISO-8859-1?B?RuRyYmVy?= Cc: aliguori@us.ibm.com, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, claudio.fontana@huawei.com, qemu-devel@nongnu.org, aderumier@odiso.com, lcapitulino@redhat.com, jfrei@linux.vnet.ibm.com, yang.z.zhang@intel.com, pbonzini@redhat.com, lig.fnst@cn.fujitsu.com, rth@twiddle.net On Mon, 22 Apr 2013 18:33:48 +0200 Andreas F=E4rber wrote: > Am 16.04.2013 00:12, schrieb Igor Mammedov: > > get_arch_id() adds possibility for generic code to get guest visible > > CPU ID without accessing CPUArchState. If target doesn't override it, > > it will return cpu_index. > >=20 > > Override it on target-i386 to return APIC ID. > >=20 > > Signed-off-by: Igor Mammedov > > --- > > * it will be used later by new cpu_exists() generic function and > > acpi_piix. > > * s/cpu_firmware_id/cpu_arch_id/ > > --- > > include/qom/cpu.h | 2 ++ > > qom/cpu.c | 6 ++++++ > > target-i386/cpu.c | 10 ++++++++++ > > 3 files changed, 18 insertions(+) >=20 > Eduardo and me had discussed on IRC that apparently the only reason we > need this generalized "arch_id" is that acpi_piix4 is shared between x86 > and mips. Did you investigate whether we can just access the x86 apic-id > property instead for x86 and leave mips as-is without hotplug support? Yep, one possible way is to used so unloved ifdefs in piix4.c and inclusion of cpu.h in it, which is not nice as well. BTW: * if ACPI will be someday used for on ARM then using cpu_arch_id() when building ACPI tables is also justified. * it could reused in s360 hotplug patches as well, if you looked at my review comment on its CPU hot-plug patch. > Andreas >=20 > >=20 > > diff --git a/include/qom/cpu.h b/include/qom/cpu.h > > index 6ce6f10..428aaf0 100644 > > --- a/include/qom/cpu.h > > +++ b/include/qom/cpu.h > > @@ -45,6 +45,7 @@ typedef struct CPUState CPUState; > > * instantiatable CPU type. > > * @reset: Callback to reset the #CPUState to its initial state. > > * @do_interrupt: Callback for interrupt handling. > > + * @get_arch_id: Callback for getting architecture depended CPU ID > > * @vmsd: State description for migration. > > * > > * Represents a CPU family or model. > > @@ -58,6 +59,7 @@ typedef struct CPUClass { > > =20 > > void (*reset)(CPUState *cpu); > > void (*do_interrupt)(CPUState *cpu); > > + int64_t (*get_arch_id)(CPUState *cpu); > > =20 > > const struct VMStateDescription *vmsd; > > } CPUClass; > > diff --git a/qom/cpu.c b/qom/cpu.c > > index 819986e..a13ddda 100644 > > --- a/qom/cpu.c > > +++ b/qom/cpu.c > > @@ -76,6 +76,11 @@ static void cpu_common_realizefn(DeviceState *dev, > > Error **errp) } > > } > > =20 > > +static int64_t cpu_common_get_arch_id(CPUState *cpu) > > +{ > > + return cpu->cpu_index; > > +} > > + > > static void cpu_class_init(ObjectClass *klass, void *data) > > { > > DeviceClass *dc =3D DEVICE_CLASS(klass); > > @@ -83,6 +88,7 @@ static void cpu_class_init(ObjectClass *klass, void > > *data)=20 > > k->class_by_name =3D cpu_common_class_by_name; > > k->reset =3D cpu_common_reset; > > + k->get_arch_id =3D cpu_common_get_arch_id; > > dc->realize =3D cpu_common_realizefn; > > dc->no_user =3D 1; > > } > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > > index e2302d8..a415fa3 100644 > > --- a/target-i386/cpu.c > > +++ b/target-i386/cpu.c > > @@ -2272,6 +2272,14 @@ static void x86_cpu_initfn(Object *obj) > > } > > } > > =20 > > +static int64_t x86_cpu_get_arch_id(CPUState *cpu) > > +{ > > + X86CPU *x86cpu =3D X86_CPU(cpu); > > + CPUX86State *env =3D &x86cpu->env; > > + > > + return env->cpuid_apic_id; > > +} > > + > > static void x86_cpu_common_class_init(ObjectClass *oc, void *data) > > { > > X86CPUClass *xcc =3D X86_CPU_CLASS(oc); > > @@ -2286,6 +2294,8 @@ static void x86_cpu_common_class_init(ObjectClass > > *oc, void *data)=20 > > cc->do_interrupt =3D x86_cpu_do_interrupt; > > cpu_class_set_vmsd(cc, &vmstate_x86_cpu); > > + > > + cc->get_arch_id =3D x86_cpu_get_arch_id; > > } > > =20 > > static const TypeInfo x86_cpu_type_info =3D { > >=20 >=20 >=20