remove icc bus/bridge
v9 cover remove icc bus/bridge
ICC Bus was used for providing a hotpluggable bus for APIC and CPU, but now we use HotplugHandler to make hotplug. So ICC Bus is unnecessary.
This code has passed the new pc-cpu-test.
And I have tested with kvm along with kernel_irqchip=on/off, it works fine.
This patch series is based on the latest master.
v9:
-use a callback to correct reset sequence for x86 -update apic mmio mapping
v8:
-add a wrapper to specify reset order
v7:
-update to register reset handler for main_system_bus when created -register reset handler for apic after all devices are initialized
Chen Fan (2):
apic: map APIC's MMIO region at each CPU's address space cpu/apic: drop icc bus/bridge
Zhu Guihua (2):
x86: use new method to correct reset sequence
icc_bus: drop the unused files
default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- hw/i386/pc.c | 43 +++++++------- hw/i386/pc_piix.c | 9 +-- hw/i386/pc_q35.c | 9 +-- hw/intc/apic_common.c | 11 +--- include/hw/cpu/icc_bus.h | 82 -------------------------- include/hw/i386/apic_internal.h | 7 ++- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 30 +++++++--- 12 files changed, 52 insertions(+), 262 deletions(-) delete mode 100644 hw/cpu/icc_bus.c delete mode 100644 include/hw/cpu/icc_bus.h
Signature · 1 line
1.9.3
PATCH v9 1/4 apic: map APIC's MMIO region at each CPU's address space
From: Chen Fan <[email protected]>
Replace mapping APIC at global system address space with mapping it at per-CPU address spaces.
--- hw/i386/pc.c | 7 ------- hw/intc/apic_common.c | 6 ------ target-i386/cpu.c | 21 +++++++++++++++++++++ 3 files changed, 21 insertions(+), 13 deletions(-)
hw/i386/pc.c +0 -7
@@ -1076,13 +1076,6 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)object_unref (OBJECT (cpu)); } -/* map APIC MMIO area if CPU has APIC */ -if (cpu && cpu->apic_state) { -/* XXX: what if the base changes? */ -sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 , -APIC_DEFAULT_ADDRESS ,0x1000 ); - } -/* tell smbios about cpuid version and features */ smbios_set_cpuid (cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX ]); }
hw/intc/apic_common.c +0 -6
@@ -296,7 +296,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp)APICCommonClass *info;static DeviceState *vapic;static int apic_no; -static bool mmio_registered;if (apic_no >=MAX_APICS ) { error_setg(errp, "%s initialization failed.",
@@ -307,11 +306,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info =APIC_COMMON_GET_CLASS (s); info->realize (dev, errp); -if (!mmio_registered) { -ICCBus *b =ICC_BUS (qdev_get_parent_bus (dev)); -memory_region_add_subregion (b->apic_address_space,0 , &s->io_memory); - mmio_registered = true; - }/* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&
target-i386/cpu.c +21 -0
@@ -2741,6 +2741,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)/* TODO: convert to link<> */ apic =APIC_COMMON (cpu->apic_state); apic->cpu = cpu; + apic->apicbase =APIC_DEFAULT_ADDRESS |MSR_IA32_APICBASE_ENABLE ; }static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp)
@@ -2785,8 +2786,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)X86CPU *cpu =X86_CPU (dev);X86CPUClass *xcc =X86_CPU_GET_CLASS (dev);CPUX86State *env = &cpu->env; +APICCommonState *apic;Error *local_err =NULL ;static bool ht_warned; +static bool apic_mmio_map_once;if (cpu->apic_id <0 ) {error_setg (errp,"apic-id property was not initialized properly" );
@@ -2873,6 +2876,24 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)if (local_err !=NULL ) { goto out; } + +/* map APIC MMIO area */ + apic =APIC_COMMON (cpu->apic_state); +if (tcg_enabled ()) { +memory_region_add_subregion_overlap (cpu->cpu_as_root, + apic->apicbase & +MSR_IA32_APICBASE_BASE , + &apic->io_memory, +0x1000 ); + }else if (!apic_mmio_map_once) { +memory_region_add_subregion_overlap (get_system_memory (), + apic->apicbase & +MSR_IA32_APICBASE_BASE , + &apic->io_memory, +0x1000 ); + apic_mmio_map_once = true; + } +cpu_reset (cs); xcc->parent_realize (dev, &local_err);
Signature · 1 line
1.9.3
PATCH v9 2/4 x86: use new method to correct reset sequence
In reply to Zhu GuihuaSomething must be occur during reset of the X86 platform in a specific order. For example, the apic reset should be after some devices (such as hpet, rtc) reset, so that the apic register could be set to default values.
This patch uses the new QEMUMachine reset method to solve the above problem, ensuring the various reset happen in the correct order.
--- hw/i386/pc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
hw/i386/pc.c +17 -0
@@ -1860,6 +1860,22 @@ static void pc_machine_initfn(Object *obj) NULL, NULL); } +static void pc_machine_reset (void ) +{ +CPUState *cs; +X86CPU *cpu; + +qemu_devices_reset (); + +CPU_FOREACH (cs) { + cpu =X86_CPU (cs); + +if (cpu->apic_state) { +device_reset (cpu->apic_state); + } + } +} +static unsigned pc_cpu_index_to_socket_id (unsigned cpu_index) {unsigned pkg_id, core_id, smt_id;
@@ -1877,6 +1893,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pcmc->get_hotplug_handler = mc->get_hotplug_handler; mc->get_hotplug_handler = pc_get_hotpug_handler; mc->cpu_index_to_socket_id = pc_cpu_index_to_socket_id; + mc->reset = pc_machine_reset; hc->plug = pc_machine_device_plug_cb; hc->unplug_request = pc_machine_device_unplug_request_cb; hc->unplug = pc_machine_device_unplug_cb;
Signature · 1 line
1.9.3
PATCH v9 3/4 cpu/apic: drop icc bus/bridge
In reply to Zhu GuihuaFrom: Chen Fan <[email protected]>
After CPU hotplug has been converted to BUS-less hot-plug infrastructure, the only function ICC bus performs is to propagate reset to LAPICs. However LAPIC could be reset by registering its reset handler after all device are initialized.
Do so and drop ~200LOC of not needed anymore ICCBus related code.
--- hw/i386/pc.c | 19 ++++--------------- hw/i386/pc_piix.c | 9 +-------- hw/i386/pc_q35.c | 9 +-------- hw/intc/apic_common.c | 5 ++--- include/hw/i386/apic_internal.h | 7 ++++--- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 9 +-------- 7 files changed, 14 insertions(+), 46 deletions(-)
hw/i386/pc.c +4 -15
@@ -59,7 +59,6 @@#include "qemu/error-report.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" -#include "hw/cpu/icc_bus.h" #include "hw/boards.h" #include "hw/pci/pci_host.h" #include "acpi-build.h"
@@ -970,23 +969,16 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) }static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id, -DeviceState *icc_bridge,Error **errp) +Error **errp) {X86CPU *cpu =NULL ;Error *local_err =NULL ; -if (icc_bridge ==NULL ) { -error_setg (&local_err,"Invalid icc-bridge value" ); - goto out; - } - cpu =cpu_x86_create (cpu_model, &local_err);if (local_err !=NULL ) { goto out; } -qdev_set_parent_bus (DEVICE (cpu),qdev_get_child_bus (icc_bridge,"icc" )); -object_property_set_int (OBJECT (cpu), apic_id,"apic-id" , &local_err);object_property_set_bool (OBJECT (cpu), true,"realized" , &local_err);
@@ -1003,7 +995,6 @@ static const char *current_cpu_model;void pc_hot_add_cpu (const int64_t id,Error **errp) { -DeviceState *icc_bridge;X86CPU *cpu;int64_t apic_id =x86_cpu_apic_id_from_index (id);Error *local_err =NULL ;
@@ -1032,9 +1023,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)return ; } - icc_bridge =DEVICE (object_resolve_path_type ("icc-bridge" , -TYPE_ICC_BRIDGE ,NULL )); - cpu =pc_new_cpu (current_cpu_model, apic_id, icc_bridge, &local_err); + cpu =pc_new_cpu (current_cpu_model, apic_id, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1042,7 +1031,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)object_unref (OBJECT (cpu)); } -void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) +void pc_cpus_init (const char *cpu_model) {int i;X86CPU *cpu =NULL ;
@@ -1068,7 +1057,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)for (i =0 ; i < smp_cpus; i++) { cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), - icc_bridge, &error); + &error);if (error) {error_report_err (error);exit (1 );
hw/i386/pc_piix.c +1 -8
@@ -39,7 +39,6 @@#include "hw/kvm/clock.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" -#include "hw/cpu/icc_bus.h" #include "sysemu/arch_init.h" #include "sysemu/block-backend.h" #include "hw/i2c/smbus.h"
@@ -98,7 +97,6 @@ static void pc_init1(MachineState *machine)MemoryRegion *ram_memory;MemoryRegion *pci_memory;MemoryRegion *rom_memory; -DeviceState *icc_bridge;PcGuestInfo *guest_info;ram_addr_t lowmem;
@@ -142,11 +140,7 @@ static void pc_init1(MachineState *machine)exit (1 ); } - icc_bridge =qdev_create (NULL ,TYPE_ICC_BRIDGE ); -object_property_add_child (qdev_get_machine (),"icc-bridge" , -OBJECT (icc_bridge),NULL ); - -pc_cpus_init (machine->cpu_model, icc_bridge); +pc_cpus_init (machine->cpu_model);if (kvm_enabled () && kvmclock_enabled) {kvmclock_create ();
@@ -229,7 +223,6 @@ static void pc_init1(MachineState *machine)if (pci_enabled) {ioapic_init_gsi (gsi_state,"i440fx" ); } -qdev_init_nofail (icc_bridge);pc_register_ferr_irq (gsi[13 ]);
hw/i386/pc_q35.c +1 -8
@@ -43,7 +43,6 @@#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" -#include "hw/cpu/icc_bus.h" #include "qemu/error-report.h" #include "migration/migration.h"
@@ -85,7 +84,6 @@ static void pc_q35_init(MachineState *machine)int i;ICH9LPCState *ich9_lpc;PCIDevice *ahci; -DeviceState *icc_bridge;PcGuestInfo *guest_info;ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];
@@ -133,11 +131,7 @@ static void pc_q35_init(MachineState *machine)exit (1 ); } - icc_bridge =qdev_create (NULL ,TYPE_ICC_BRIDGE ); -object_property_add_child (qdev_get_machine (),"icc-bridge" , -OBJECT (icc_bridge),NULL ); - -pc_cpus_init (machine->cpu_model, icc_bridge); +pc_cpus_init (machine->cpu_model);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create ();
@@ -239,7 +233,6 @@ static void pc_q35_init(MachineState *machine)if (pci_enabled) {ioapic_init_gsi (gsi_state,"q35" ); } -qdev_init_nofail (icc_bridge);pc_register_ferr_irq (gsi[13 ]);
hw/intc/apic_common.c +2 -3
@@ -419,13 +419,12 @@ static Property apic_properties_common[] = {static void apic_common_class_init (ObjectClass *klass,void *data) { -ICCDeviceClass *idc =ICC_DEVICE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->vmsd = &vmstate_apic_common; dc->reset = apic_reset_common; dc->props = apic_properties_common; - idc->realize = apic_common_realize; + dc->realize = apic_common_realize;/* * Reason: APIC and CPU need to be wired up by * x86_cpu_apic_create()
@@ -435,7 +434,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data)static const TypeInfo apic_common_type = { .name =TYPE_APIC_COMMON , - .parent =TYPE_ICC_DEVICE , + .parent =TYPE_DEVICE , .instance_size =sizeof (APICCommonState), .class_size =sizeof (APICCommonClass), .class_init = apic_common_class_init,
include/hw/i386/apic_internal.h +4 -3
@@ -21,7 +21,6 @@#define QEMU_APIC_INTERNAL_H #include "exec/memory.h" -#include "hw/cpu/icc_bus.h" #include "qemu/timer.h" /* APIC Local Vector Table */
@@ -78,7 +77,7 @@ typedef struct APICCommonState APICCommonState; typedef struct APICCommonClass { - ICCDeviceClass parent_class; + DeviceClass parent_class; DeviceRealize realize; void (*set_base)(APICCommonState *s, uint64_t val);
@@ -93,7 +92,9 @@ typedef struct APICCommonClass } APICCommonClass;struct APICCommonState { -ICCDevice busdev; +/*< private >*/ +DeviceState parent_obj; +/*< public >*/ MemoryRegion io_memory;X86CPU *cpu;
include/hw/i386/pc.h +1 -1
@@ -161,7 +161,7 @@ extern int fd_bootchk;void pc_register_ferr_irq (qemu_irq irq);void pc_acpi_smi_interrupt (void *opaque,int irq,int level); -void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge); +void pc_cpus_init (const char *cpu_model);void pc_hot_add_cpu (const int64_t id,Error **errp);void pc_acpi_init (const char *default_dsdt);
target-i386/cpu.c +1 -8
@@ -43,7 +43,6 @@#include "sysemu/sysemu.h" #include "hw/qdev-properties.h" -#include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "exec/address-spaces.h" #include "hw/xen/xen.h"
@@ -2719,7 +2718,6 @@ static void mce_init(X86CPU *cpu)#ifndef CONFIG_USER_ONLY static void x86_cpu_apic_create (X86CPU *cpu,Error **errp) { -DeviceState *dev =DEVICE (cpu);APICCommonState *apic;const char *apic_type ="apic" ;
@@ -2729,11 +2727,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) apic_type ="xen-apic" ; } - cpu->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type); -if (cpu->apic_state ==NULL ) { -error_setg (errp,"APIC device '%s' could not be created" , apic_type); -return ; - } + cpu->apic_state =DEVICE (object_new (apic_type));object_property_add_child (OBJECT (cpu),"apic" ,OBJECT (cpu->apic_state),NULL );
@@ -3155,7 +3149,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; - dc->bus_type =TYPE_ICC_BUS ; dc->props = x86_cpu_properties; xcc->parent_reset = cc->reset;
Signature · 1 line
1.9.3
PATCH v9 4/4 icc_bus: drop the unused files
In reply to Zhu GuihuaICC bus impl has been droped, so all icc related files are not useful any more; delete them.
--- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- include/hw/cpu/icc_bus.h | 82 -------------------------- 5 files changed, 203 deletions(-) delete mode 100644 hw/cpu/icc_bus.c delete mode 100644 include/hw/cpu/icc_bus.h
default-configs/i386-softmmu.mak +0 -1
@@ -42,7 +42,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_XIO3130=y
default-configs/x86_64-softmmu.mak +0 -1
@@ -43,7 +43,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_XIO3130=y
hw/cpu/Makefile.objs +0 -1
@@ -2,5 +2,4 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o obj-$(CONFIG_REALVIEW) += realview_mpcore.o obj-$(CONFIG_A9MPCORE) += a9mpcore.o obj-$(CONFIG_A15MPCORE) += a15mpcore.o -obj-$(CONFIG_ICC_BUS) += icc_bus.o
hw/cpu/icc_bus.c deleted +0 -118
118 lines not on this page · raw message
include/hw/cpu/icc_bus.h deleted +0 -82
82 lines not on this page · raw message
Signature · 1 line
1.9.3
ping...
Quoted 45 lines · Zhu Guihua
ICC Bus was used for providing a hotpluggable bus for APIC and CPU, but now we use HotplugHandler to make hotplug. So ICC Bus is unnecessary.
This code has passed the new pc-cpu-test.
And I have tested with kvm along with kernel_irqchip=on/off, it works fine.This patch series is based on the latest master.
v9:
-use a callback to correct reset sequence for x86 -update apic mmio mappingv8:
-add a wrapper to specify reset orderv7:
-update to register reset handler formain_system_buswhen created -register reset handler for apic after all devices are initializedChen Fan (2):
apic: map APIC's MMIO region at each CPU's address space cpu/apic: drop icc bus/bridgeZhu Guihua (2):
x86: use new method to correct reset sequence
icc_bus: drop the unused filesdefault-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- hw/i386/pc.c | 43 +++++++------- hw/i386/pc_piix.c | 9 +-- hw/i386/pc_q35.c | 9 +-- hw/intc/apic_common.c | 11 +--- include/hw/cpu/icc_bus.h | 82 -------------------------- include/hw/i386/apic_internal.h | 7 ++- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 30 +++++++--- 12 files changed, 52 insertions(+), 262 deletions(-)delete mode 100644
hw/cpu/icc_bus.c
delete mode 100644include/hw/cpu/icc_bus.h
Quoted 1 line · On Thu, 16 Jul 2015 10:45:41 +0800 Zhu Guihua <[email protected]> wrote:
ping...
I'll look at it once 2.4 is released.
Quoted 49 lines · Zhu Guihua
Quoted 45 lines
ICC Bus was used for providing a hotpluggable bus for APIC and CPU, but now we use HotplugHandler to make hotplug. So ICC Bus is unnecessary.
This code has passed the new pc-cpu-test.
And I have tested with kvm along with kernel_irqchip=on/off, it works fine.This patch series is based on the latest master.
v9:
-use a callback to correct reset sequence for x86 -update apic mmio mappingv8:
-add a wrapper to specify reset orderv7:
-update to register reset handler formain_system_buswhen created -register reset handler for apic after all devices are initializedChen Fan (2):
apic: map APIC's MMIO region at each CPU's address space cpu/apic: drop icc bus/bridgeZhu Guihua (2):
x86: use new method to correct reset sequence
icc_bus: drop the unused filesdefault-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- hw/i386/pc.c | 43 +++++++------- hw/i386/pc_piix.c | 9 +-- hw/i386/pc_q35.c | 9 +-- hw/intc/apic_common.c | 11 +--- include/hw/cpu/icc_bus.h | 82 -------------------------- include/hw/i386/apic_internal.h | 7 ++- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 30 +++++++--- 12 files changed, 52 insertions(+), 262 deletions(-)delete mode 100644
hw/cpu/icc_bus.c
delete mode 100644include/hw/cpu/icc_bus.h
Quoted 5 lines · Igor Mammedov
Quoted 1 line · On Thu, 16 Jul 2015 10:45:41 +0800 Zhu Guihua <[email protected]> wrote:
ping...
I'll look at it once 2.4 is released.
Got it, thanks.
By the way, do you know what state of qemu socket topology ?
Regards,
Zhu
Quoted 50 lines
Quoted 31 lines · Zhu Guihua
Quoted 29 lines
ICC Bus was used for providing a hotpluggable bus for APIC and CPU, but now we use HotplugHandler to make hotplug. So ICC Bus is unnecessary.
This code has passed the new pc-cpu-test.
And I have tested with kvm along with kernel_irqchip=on/off, it works fine.This patch series is based on the latest master.
v9:
-use a callback to correct reset sequence for x86 -update apic mmio mappingv8:
-add a wrapper to specify reset orderv7:
-update to register reset handler formain_system_buswhen created -register reset handler for apic after all devices are initializedChen Fan (2):
apic: map APIC's MMIO region at each CPU's address space cpu/apic: drop icc bus/bridgeZhu Guihua (2):
x86: use new method to correct reset sequence
icc_bus: drop the unused filesQuoted 17 lines
Quoted 13 lines
default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- hw/i386/pc.c | 43 +++++++------- hw/i386/pc_piix.c | 9 +-- hw/i386/pc_q35.c | 9 +-- hw/intc/apic_common.c | 11 +--- include/hw/cpu/icc_bus.h | 82 -------------------------- include/hw/i386/apic_internal.h | 7 ++- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 30 +++++++--- 12 files changed, 52 insertions(+), 262 deletions(-)Quoted 3 lines
delete mode 100644
hw/cpu/icc_bus.c
delete mode 100644include/hw/cpu/icc_bus.h.
Quoted 11 lines · On Mon, 20 Jul 2015 09:00:06 +0800 Zhu Guihua <[email protected]> wrote:
Quoted 5 lines · Igor Mammedov
Quoted 1 line · On Thu, 16 Jul 2015 10:45:41 +0800 Zhu Guihua <[email protected]> wrote:
ping...
I'll look at it once 2.4 is released.
Got it, thanks.
By the way, do you know what state of qemu socket topology ?
There were no changes/progress as far as I remember.
Quoted 55 lines
Regards,
ZhuQuoted 50 lines
Quoted 31 lines · Zhu Guihua
Quoted 29 lines
ICC Bus was used for providing a hotpluggable bus for APIC and CPU, but now we use HotplugHandler to make hotplug. So ICC Bus is unnecessary.
This code has passed the new pc-cpu-test.
And I have tested with kvm along with kernel_irqchip=on/off, it works fine.This patch series is based on the latest master.
v9:
-use a callback to correct reset sequence for x86 -update apic mmio mappingv8:
-add a wrapper to specify reset orderv7:
-update to register reset handler formain_system_buswhen created -register reset handler for apic after all devices are initializedChen Fan (2):
apic: map APIC's MMIO region at each CPU's address space cpu/apic: drop icc bus/bridgeZhu Guihua (2):
x86: use new method to correct reset sequence
icc_bus: drop the unused filesQuoted 17 lines
Quoted 13 lines
default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- hw/i386/pc.c | 43 +++++++------- hw/i386/pc_piix.c | 9 +-- hw/i386/pc_q35.c | 9 +-- hw/intc/apic_common.c | 11 +--- include/hw/cpu/icc_bus.h | 82 -------------------------- include/hw/i386/apic_internal.h | 7 ++- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 30 +++++++--- 12 files changed, 52 insertions(+), 262 deletions(-)Quoted 3 lines
delete mode 100644
hw/cpu/icc_bus.c
delete mode 100644include/hw/cpu/icc_bus.h.