Commit 46232aaa authored by Chen Fan's avatar Chen Fan Committed by Eduardo Habkost
Browse files

cpu/apic: drop icc bus/bridge 



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 ~30LOC of not needed anymore ICCBus related code.

Signed-off-by: default avatarChen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: default avatarZhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent ae50c55a

hw/i386/pc.c

+4 −15
Original line number Diff line number Diff line
@@ -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"
@@ -1052,23 +1051,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);
@@ -1085,7 +1077,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;
@@ -1114,9 +1105,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;
@@ -1124,7 +1113,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;
@@ -1150,7 +1139,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
Original line number Diff line number Diff line
@@ -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;
@@ -141,11 +139,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();
@@ -226,7 +220,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
Original line number Diff line number Diff line
@@ -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"
@@ -83,7 +82,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];
@@ -130,11 +128,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();
@@ -236,7 +230,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include "cpu.h"

#include "exec/memory.h"

#include "hw/cpu/icc_bus.h"

#include "qemu/timer.h"



/* APIC Local Vector Table */
@@ -135,7 +134,7 @@ typedef struct APICCommonState APICCommonState; 


typedef struct APICCommonClass

{

    ICCDeviceClass parent_class;

    DeviceClass parent_class;



    DeviceRealize realize;

    void (*set_base)(APICCommonState *s, uint64_t val);
@@ -150,7 +149,9 @@ typedef struct APICCommonClass 
} APICCommonClass;



struct APICCommonState {

    ICCDevice busdev;

    /*< private >*/

    DeviceState parent_obj;

    /*< public >*/



    MemoryRegion io_memory;

    X86CPU *cpu;