This series removes the APIC ID initialization code from x86_cpu_initfn() (getting us one step closer to making object_new() of X86CPU have no dependency on cpu_exec_init() and other global QEMU state), and moves the APIC ID compatibility logic from target-i386/cpu.c to hw/i386/pc.c.
Eduardo Habkost (8): target-i386: Rename cpu_x86_init() to cpu_x86_init_user() target-i386: Eliminate cpu_init() function target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id target-i386: Keep track of apic-id setting target-i386: Set APIC ID using cpu_index on CONFIG_USER target-i386: Don't set APIC ID on instance_init target-i386: Move topology.h to hw/i386/topology.h target-i386: Move APIC ID compatibility code to pc.c hw/i386/pc.c | 35 ++++++++++++++++++++ {target-i386 => hw/i386}/topology.h | 6 ++-- target-i386/cpu-qom.h | 2 ++ target-i386/cpu.c | 66 ++++++++++++------------------------- target-i386/cpu.h | 13 ++------ target-i386/kvm.c | 2 +- tests/Makefile | 2 -- tests/test-x86-cpuid.c | 2 +- 8 files changed, 66 insertions(+), 62 deletions(-) rename {target-i386 => hw/i386}/topology.h (97%) -- 1.9.3