Am 29.04.2013 17:02, schrieb Igor Mammedov: > X86CPU should have parent bus so it could provide bus for child APIC. > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > Signed-off-by: Andreas Färber <afaer...@suse.de> > --- > TODO: fix unplug of bus-less devices in device-del > > v2: > - pass icc_bridge to cpu_x86_create instead of resolving it each time > --- > hw/i386/pc.c | 10 ++++++---- > hw/i386/pc_piix.c | 2 +- > hw/i386/pc_q35.c | 2 +- > include/hw/i386/pc.h | 2 +- > target-i386/cpu.c | 11 +++++++++-- > target-i386/cpu.h | 3 ++- > 6 files changed, 20 insertions(+), 10 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 7c7dd86..658ff6c 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -890,12 +890,13 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int > level) > } > } > > -static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error > **errp) > +static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, > + DeviceState *icc_bridge, Error **errp) > { > X86CPU *cpu; > Error *local_err = NULL; > > - cpu = cpu_x86_create(cpu_model, errp); > + cpu = cpu_x86_create(cpu_model, icc_bridge, errp); > if (!cpu) { > return cpu; > } > @@ -913,7 +914,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t > apic_id, Error **errp) > return cpu; > } > > -void pc_cpus_init(const char *cpu_model) > +void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) > { > int i; > Error *error = NULL; > @@ -928,7 +929,8 @@ void pc_cpus_init(const char *cpu_model) > } > > for (i = 0; i < smp_cpus; i++) { > - pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), &error); > + pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), > + icc_bridge, &error); > if (error) { > fprintf(stderr, "%s\n", error_get_pretty(error)); > error_free(error); > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 51b738a..2190f0a 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory, > object_property_add_child(qdev_get_machine(), "icc-bridge", > OBJECT(icc_bridge), NULL); > > - pc_cpus_init(cpu_model); > + pc_cpus_init(cpu_model, icc_bridge); > pc_acpi_init("acpi-dsdt.aml"); > > if (kvmclock_enabled) { > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 317dd0c..a926e38 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -80,7 +80,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) > object_property_add_child(qdev_get_machine(), "icc-bridge", > OBJECT(icc_bridge), NULL); > > - pc_cpus_init(cpu_model); > + pc_cpus_init(cpu_model, icc_bridge); > pc_acpi_init("q35-acpi-dsdt.aml"); > > kvmclock_create(); > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 14b504c..8a6e76c 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -78,7 +78,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); > +void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge); > void pc_acpi_init(const char *default_dsdt); > void *pc_memory_init(MemoryRegion *system_memory, > const char *kernel_filename, > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 0d9493d..94856ec 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -41,6 +41,7 @@ > #endif > > #include "sysemu/sysemu.h" > +#include "hw/cpu/icc_bus.h" > #ifndef CONFIG_USER_ONLY > #include "hw/xen/xen.h" > #include "hw/sysbus.h" > @@ -1618,7 +1619,8 @@ static void cpu_x86_register(X86CPU *cpu, const char > *name, Error **errp) > object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); > } > > -X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) > +X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, > + Error **errp) > { > X86CPU *cpu = NULL; > CPUX86State *env; > @@ -1635,6 +1637,10 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error > **errp) > features = model_pieces[1]; > > cpu = X86_CPU(object_new(TYPE_X86_CPU)); > +#ifndef CONFIG_USER_ONLY > + qdev_set_parent_bus(DEVICE(cpu), qdev_get_child_bus(icc_bridge, "icc")); > + object_unref(OBJECT(cpu)); > +#endif > env = &cpu->env; > env->cpu_model_str = cpu_model; > > @@ -1659,7 +1665,7 @@ X86CPU *cpu_x86_init(const char *cpu_model) > Error *error = NULL; > X86CPU *cpu; > > - cpu = cpu_x86_create(cpu_model, &error); > + cpu = cpu_x86_create(cpu_model, NULL, &error); > if (error) { > goto out; > }
This strikes me as unsafe: It relies on cpu_x86_init() / cpu_init() not being used for softmmu. Could you please send a follow-up to squash adding icc_bridge == NULL error handling in the #ifdef? Andreas > @@ -2346,6 +2352,7 @@ 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; > > xcc->parent_reset = cc->reset; > cc->reset = x86_cpu_reset; > diff --git a/target-i386/cpu.h b/target-i386/cpu.h > index ab151d5..f193752 100644 > --- a/target-i386/cpu.h > +++ b/target-i386/cpu.h > @@ -897,7 +897,8 @@ typedef struct CPUX86State { > #include "cpu-qom.h" > > X86CPU *cpu_x86_init(const char *cpu_model); > -X86CPU *cpu_x86_create(const char *cpu_model, Error **errp); > +X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, > + Error **errp); > int cpu_x86_exec(CPUX86State *s); > void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); > void x86_cpudef_setup(void); > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg