From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPWhp-0008QG-AT for qemu-devel@nongnu.org; Tue, 09 Apr 2013 07:27:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPWhn-0001Ra-BH for qemu-devel@nongnu.org; Tue, 09 Apr 2013 07:27:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPWhn-0001RT-3v for qemu-devel@nongnu.org; Tue, 09 Apr 2013 07:27:15 -0400 Message-ID: <5163FAFD.9070808@redhat.com> Date: Tue, 09 Apr 2013 13:26:53 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1365172636-28628-1-git-send-email-imammedo@redhat.com> <1365172636-28628-15-git-send-email-imammedo@redhat.com> In-Reply-To: <1365172636-28628-15-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 14/22] target-i386: introduce apic-id property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: aliguori@us.ibm.com, ehabkost@redhat.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, afaerber@suse.de, lig.fnst@cn.fujitsu.com, rth@twiddle.net Il 05/04/2013 16:37, Igor Mammedov ha scritto: > ... and use it from board level to set APIC ID for CPUs > it creates. > > Signed-off-by: Igor Mammedov > --- > Note: > * pc_new_cpu() function will be reused later in CPU hot-plug hook. > > v2: > * use generic cpu_exists() instead of custom one > * make apic-id dynamic property, so it won't be possible to use it > as global property, since it's instance specific > --- > hw/i386/pc.c | 25 ++++++++++++++++++++++++- > target-i386/cpu.c | 38 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 62 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index ebbf059..9d617b4 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -869,9 +869,29 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) > } > } > > +static void pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp) > +{ > + X86CPU *cpu; > + > + cpu = cpu_x86_create(cpu_model, errp); > + if (!cpu) { > + return; > + } > + > + object_property_set_int(OBJECT(cpu), apic_id, "apic-id", errp); > + object_property_set_bool(OBJECT(cpu), true, "realized", errp); > + > + if (error_is_set(errp)) { > + if (cpu != NULL) { > + object_unref(OBJECT(cpu)); > + } > + } > +} > + > void pc_cpus_init(const char *cpu_model) > { > int i; > + Error *error = NULL; > > /* init CPUs */ > if (cpu_model == NULL) { > @@ -883,7 +903,10 @@ void pc_cpus_init(const char *cpu_model) > } > > for (i = 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 858fd54..db56b52 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1272,6 +1272,41 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, > cpu->env.tsc_khz = value / 1000; > } > > +static void x86_cpuid_get_apic_id(Object *obj, Visitor *v, void *opaque, > + const char *name, Error **errp) > +{ > + X86CPU *cpu = X86_CPU(obj); > + int64_t value = 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 = X86_CPU(obj); > + const int64_t min = 0; > + const int64_t max = UINT32_MAX; > + int64_t value; > + > + visit_type_int(v, &value, name, errp); > + if (error_is_set(errp)) { > + return; > + } Please use a local Error* function and error_propagate. > + 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 (cpu_exists(value)) { > + error_setg(errp, "CPU with APIC ID %" PRIi64 " exists", value); > + return; > + } > + cpu->env.cpuid_apic_id = value; > +} > + > static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name) > { > x86_def_t *def; > @@ -2256,6 +2291,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); > > env->cpuid_apic_id = x86_cpu_apic_id_from_index(cs->cpu_index); > > With the above change, Reviewed-by: Paolo Bonzini