[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on CONFIG_USER |
Date: |
Tue, 3 Feb 2015 17:39:29 -0200 |
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 <address@hidden>
Cc: Gu Zheng <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 2/9] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 3/9] target-i386: Eliminate cpu_init() function, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 1/9] target-i386: Move topology.h to include/hw/i386, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 5/9] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 9/9] target-i386: Move APIC ID compatibility code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 6/9] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on CONFIG_USER,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v2 8/9] target-i386: Require APIC ID to be explicitly set before CPU realize, Eduardo Habkost, 2015/02/03
- Re: [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Paolo Bonzini, 2015/02/04