From patchwork Thu Apr 11 14:51:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 235803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9E9FF2C0082 for ; Fri, 12 Apr 2013 01:31:53 +1000 (EST) Received: from localhost ([::1]:46380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIwa-0006xv-NK for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 10:57:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIs4-0003OH-C0 for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQIs2-00070Q-Q8 for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:53:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIs2-00070I-Hy for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:53:02 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3BEqeld028221 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Apr 2013 10:52:40 -0400 Received: from thinkpad.redhat.com (vpn-239-94.phx2.redhat.com [10.3.239.94]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3BEpxKk026072; Thu, 11 Apr 2013 10:52:37 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2013 16:51:50 +0200 Message-Id: <1365691918-30594-12-git-send-email-imammedo@redhat.com> In-Reply-To: <1365691918-30594-1-git-send-email-imammedo@redhat.com> References: <1365691918-30594-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, claudio.fontana@huawei.com, 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 Subject: [Qemu-devel] [PATCH 11/19] target-i386: introduce apic-id property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org ... and use it from board level to set APIC ID for CPUs it creates. Signed-off-by: Igor Mammedov Reviewed-by: Paolo Bonzini --- Note: * pc_new_cpu() function will be reused later in CPU hot-plug hook. v3: * user error_propagate() in property setter 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 | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8d75b34..3adf294 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 9cca031..4ddc18a 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1272,6 +1272,45 @@ 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; + Error *error = 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(&error, "Property %s.%s doesn't take value %" PRId64 + " (minimum: %" PRId64 ", maximum: %" PRId64 ")" , + object_get_typename(obj), name, value, min, max); + error_propagate(errp, error); + return; + } + + if (cpu_exists(value)) { + error_setg(&error, "CPU with APIC ID %" PRIi64 " exists", value); + error_propagate(errp, error); + 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; @@ -2259,6 +2298,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);