[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] target-i386: Set APIC ID using cpu_index on CON
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 5/8] target-i386: Set APIC ID using cpu_index on CONFIG_USER |
Date: |
Fri, 19 Dec 2014 00:41:21 -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 bb9525d..4b0e0a5 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2161,6 +2161,12 @@ CPUX86State *cpu_x86_init_user(const char *cpu_model)
goto out;
}
+ object_property_set_int(OBJECT(cpu), CPU(cpu)->cpu_index, "apic-id",
+ &error);
+ if (error) {
+ goto out;
+ }
+
object_property_set_bool(OBJECT(cpu), true, "realized", &error);
out:
--
1.9.3
- [Qemu-devel] [PATCH 0/8] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 1/8] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 4/8] target-i386: Keep track of apic-id setting, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 3/8] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 6/8] target-i386: Don't set APIC ID on instance_init, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 2/8] target-i386: Eliminate cpu_init() function, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 5/8] target-i386: Set APIC ID using cpu_index on CONFIG_USER,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 7/8] target-i386: Move topology.h to hw/i386/topology.h, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 8/8] target-i386: Move APIC ID compatibility code to pc.c, Eduardo Habkost, 2014/12/18