From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIjRG-0003ke-JD for qemu-devel@nongnu.org; Tue, 03 Feb 2015 14:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIjRD-0000oy-0i for qemu-devel@nongnu.org; Tue, 03 Feb 2015 14:47:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIjRC-0000or-Oy for qemu-devel@nongnu.org; Tue, 03 Feb 2015 14:47:06 -0500 From: Eduardo Habkost Date: Tue, 3 Feb 2015 17:39:29 -0200 Message-Id: <1422992371-4145-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1422992371-4145-1-git-send-email-ehabkost@redhat.com> References: <1422992371-4145-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on CONFIG_USER List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gu Zheng , Igor Mammedov , Paolo Bonzini The PC CPU initialization code already sets apic-id based on the CPU topology, and CONFIG_USER doesn't need the topology-based APIC ID calculation code. Make CONFIG_USER set apic-id before realizing the CPU (just like PC already does), so we can simplify x86_cpu_initfn later. As there is no CPU topology configuration in CONFIG_USER, just use cpu_index as the APIC ID. Signed-off-by: Eduardo Habkost Cc: Gu Zheng --- target-i386/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1f01090..f17fd36 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2159,6 +2159,12 @@ CPUX86State *cpu_x86_init_user(const char *cpu_model) goto error; } + object_property_set_int(OBJECT(cpu), CPU(cpu)->cpu_index, "apic-id", + &error); + if (error) { + goto error; + } + object_property_set_bool(OBJECT(cpu), true, "realized", &error); if (error) { goto error; -- 2.1.0