From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUDHO-0007ip-WF for qemu-devel@nongnu.org; Mon, 22 Apr 2013 05:43:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUDHL-0007EI-U0 for qemu-devel@nongnu.org; Mon, 22 Apr 2013 05:43:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUDHL-0007EE-Lr for qemu-devel@nongnu.org; Mon, 22 Apr 2013 05:43:19 -0400 Date: Mon, 22 Apr 2013 12:42:56 +0300 From: "Michael S. Tsirkin" Message-ID: <20130422094256.GA3808@redhat.com> References: <1366063976-4909-1-git-send-email-imammedo@redhat.com> <1366063976-4909-8-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1366063976-4909-8-git-send-email-imammedo@redhat.com> 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: Igor Mammedov Cc: aliguori@us.ibm.com, ehabkost@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, afaerber@suse.de, lig.fnst@cn.fujitsu.com, rth@twiddle.net On Tue, Apr 16, 2013 at 12:12:47AM +0200, Igor Mammedov wrote: > 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. > > Override it on target-i386 to return APIC ID. > > Signed-off-by: Igor Mammedov Will also be helpful for dynamic ACPI Laszlo and me are working on. Acked-by: Michael S. Tsirkin > --- > * 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(+) > > 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 { > > void (*reset)(CPUState *cpu); > void (*do_interrupt)(CPUState *cpu); > + int64_t (*get_arch_id)(CPUState *cpu); > > 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) > } > } > > +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 = DEVICE_CLASS(klass); > @@ -83,6 +88,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) > > k->class_by_name = cpu_common_class_by_name; > k->reset = cpu_common_reset; > + k->get_arch_id = cpu_common_get_arch_id; > dc->realize = cpu_common_realizefn; > dc->no_user = 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) > } > } > > +static int64_t x86_cpu_get_arch_id(CPUState *cpu) > +{ > + X86CPU *x86cpu = X86_CPU(cpu); > + CPUX86State *env = &x86cpu->env; > + > + return env->cpuid_apic_id; > +} > + > static void x86_cpu_common_class_init(ObjectClass *oc, void *data) > { > X86CPUClass *xcc = X86_CPU_CLASS(oc); > @@ -2286,6 +2294,8 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) > > cc->do_interrupt = x86_cpu_do_interrupt; > cpu_class_set_vmsd(cc, &vmstate_x86_cpu); > + > + cc->get_arch_id = x86_cpu_get_arch_id; > } > > static const TypeInfo x86_cpu_type_info = { > -- > 1.8.2 >