From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVp-0001zu-2j for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1nVk-0002WL-FX for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54424) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVk-0002WH-8o for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:48 -0500 From: Eduardo Habkost Date: Fri, 19 Dec 2014 00:41:22 -0200 Message-Id: <1418956884-24022-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> References: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] target-i386: Don't set APIC ID on instance_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gu Zheng , Igor Mammedov , Paolo Bonzini Instead of setting APIC ID automatically when creating a X86CPU, require the property to be set before realizing the object (which all callers of cpu_x86_create() already do). Signed-off-by: Eduardo Habkost Cc: Gu Zheng --- target-i386/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 4b0e0a5..4b6e19b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2789,6 +2789,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) Error *local_err = NULL; static bool ht_warned; + if (!cpu->apic_id_set) { + error_setg(errp, "apic-id property was not set"); + return; + } + if (env->features[FEAT_7_0_EBX] && env->cpuid_level < 7) { env->cpuid_level = 7; } @@ -2932,7 +2937,6 @@ static void x86_cpu_initfn(Object *obj) NULL, NULL, (void *)cpu->filtered_features, NULL); cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; - cpu->apic_id = x86_cpu_apic_id_from_index(cs->cpu_index); x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort); -- 1.9.3