From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXtgB-00030A-8p for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXtg3-0004Wd-QK for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:11 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46619 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXtg3-0004Vg-HI for qemu-devel@nongnu.org; Thu, 02 May 2013 09:36:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 2 May 2013 15:35:39 +0200 Message-Id: <1367501755-32272-14-git-send-email-afaerber@suse.de> In-Reply-To: <1367501755-32272-1-git-send-email-afaerber@suse.de> References: <1367501755-32272-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 13/29] target-i386: Introduce apic-id CPU property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Igor Mammedov The property is used from board level to set APIC ID for CPUs it creates. Do so in a new pc_new_cpu() helper, to be reused for hot-plug. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- hw/i386/pc.c | 29 ++++++++++++++++++++++++++++- target-i386/cpu.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 867add7..6568173 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -894,9 +894,33 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, in= t level) } } =20 +static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error = **errp) +{ + X86CPU *cpu; + Error *local_err =3D NULL; + + cpu =3D cpu_x86_create(cpu_model, errp); + if (!cpu) { + return cpu; + } + + object_property_set_int(OBJECT(cpu), apic_id, "apic-id", &local_err)= ; + object_property_set_bool(OBJECT(cpu), true, "realized", &local_err); + + if (local_err) { + if (cpu !=3D NULL) { + object_unref(OBJECT(cpu)); + cpu =3D NULL; + } + error_propagate(errp, local_err); + } + return cpu; +} + void pc_cpus_init(const char *cpu_model) { int i; + Error *error =3D NULL; =20 /* init CPUs */ if (cpu_model =3D=3D NULL) { @@ -908,7 +932,10 @@ void pc_cpus_init(const char *cpu_model) } =20 for (i =3D 0; i < smp_cpus; i++) { - if (!cpu_x86_init(cpu_model)) { + pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), &error); + if (error) { + fprintf(stderr, "%s\n", error_get_pretty(error)); + error_free(error); exit(1); } } diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 697848d..f1cecc0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1271,6 +1271,43 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Vi= sitor *v, void *opaque, cpu->env.tsc_khz =3D value / 1000; } =20 +static void x86_cpuid_get_apic_id(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu =3D X86_CPU(obj); + int64_t value =3D cpu->env.cpuid_apic_id; + + visit_type_int(v, &value, name, errp); +} + +static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu =3D X86_CPU(obj); + const int64_t min =3D 0; + const int64_t max =3D UINT32_MAX; + Error *error =3D NULL; + int64_t value; + + visit_type_int(v, &value, name, &error); + if (error) { + error_propagate(errp, error); + return; + } + if (value < min || value > max) { + error_setg(errp, "Property %s.%s doesn't take value %" PRId64 + " (minimum: %" PRId64 ", maximum: %" PRId64 ")" , + object_get_typename(obj), name, value, min, max); + return; + } + + if ((value !=3D cpu->env.cpuid_apic_id) && cpu_exists(value)) { + error_setg(errp, "CPU with APIC ID %" PRIi64 " exists", value); + return; + } + cpu->env.cpuid_apic_id =3D value; +} + static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name= ) { x86_def_t *def; @@ -2270,6 +2307,9 @@ static void x86_cpu_initfn(Object *obj) object_property_add(obj, "tsc-frequency", "int", x86_cpuid_get_tsc_freq, x86_cpuid_set_tsc_freq, NULL, NULL, NULL); + object_property_add(obj, "apic-id", "int", + x86_cpuid_get_apic_id, + x86_cpuid_set_apic_id, NULL, NULL, NULL); =20 env->cpuid_apic_id =3D x86_cpu_apic_id_from_index(cs->cpu_index); =20 --=20 1.8.1.4