target-i386: Attach ICC bus to CPU on its creation
X86CPU should have parent bus so it could provide bus for child APIC. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
f0513d2c01
commit
62fc403f11
10
hw/i386/pc.c
10
hw/i386/pc.c
|
@ -894,12 +894,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;
|
X86CPU *cpu;
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
cpu = cpu_x86_create(cpu_model, errp);
|
cpu = cpu_x86_create(cpu_model, icc_bridge, errp);
|
||||||
if (!cpu) {
|
if (!cpu) {
|
||||||
return cpu;
|
return cpu;
|
||||||
}
|
}
|
||||||
|
@ -917,7 +918,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp)
|
||||||
return cpu;
|
return cpu;
|
||||||
}
|
}
|
||||||
|
|
||||||
void pc_cpus_init(const char *cpu_model)
|
void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
Error *error = NULL;
|
Error *error = NULL;
|
||||||
|
@ -932,7 +933,8 @@ void pc_cpus_init(const char *cpu_model)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < smp_cpus; i++) {
|
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) {
|
if (error) {
|
||||||
fprintf(stderr, "%s\n", error_get_pretty(error));
|
fprintf(stderr, "%s\n", error_get_pretty(error));
|
||||||
error_free(error);
|
error_free(error);
|
||||||
|
|
|
@ -95,7 +95,7 @@ static void pc_init1(MemoryRegion *system_memory,
|
||||||
object_property_add_child(qdev_get_machine(), "icc-bridge",
|
object_property_add_child(qdev_get_machine(), "icc-bridge",
|
||||||
OBJECT(icc_bridge), NULL);
|
OBJECT(icc_bridge), NULL);
|
||||||
|
|
||||||
pc_cpus_init(cpu_model);
|
pc_cpus_init(cpu_model, icc_bridge);
|
||||||
pc_acpi_init("acpi-dsdt.aml");
|
pc_acpi_init("acpi-dsdt.aml");
|
||||||
|
|
||||||
if (kvmclock_enabled) {
|
if (kvmclock_enabled) {
|
||||||
|
|
|
@ -82,7 +82,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
|
||||||
object_property_add_child(qdev_get_machine(), "icc-bridge",
|
object_property_add_child(qdev_get_machine(), "icc-bridge",
|
||||||
OBJECT(icc_bridge), NULL);
|
OBJECT(icc_bridge), NULL);
|
||||||
|
|
||||||
pc_cpus_init(cpu_model);
|
pc_cpus_init(cpu_model, icc_bridge);
|
||||||
pc_acpi_init("q35-acpi-dsdt.aml");
|
pc_acpi_init("q35-acpi-dsdt.aml");
|
||||||
|
|
||||||
kvmclock_create();
|
kvmclock_create();
|
||||||
|
|
|
@ -78,7 +78,7 @@ extern int fd_bootchk;
|
||||||
void pc_register_ferr_irq(qemu_irq irq);
|
void pc_register_ferr_irq(qemu_irq irq);
|
||||||
void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
|
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_acpi_init(const char *default_dsdt);
|
||||||
void *pc_memory_init(MemoryRegion *system_memory,
|
void *pc_memory_init(MemoryRegion *system_memory,
|
||||||
const char *kernel_filename,
|
const char *kernel_filename,
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
|
#include "hw/cpu/icc_bus.h"
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
#include "hw/xen/xen.h"
|
#include "hw/xen/xen.h"
|
||||||
#include "hw/sysbus.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);
|
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;
|
X86CPU *cpu = NULL;
|
||||||
CPUX86State *env;
|
CPUX86State *env;
|
||||||
|
@ -1635,6 +1637,14 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp)
|
||||||
features = model_pieces[1];
|
features = model_pieces[1];
|
||||||
|
|
||||||
cpu = X86_CPU(object_new(TYPE_X86_CPU));
|
cpu = X86_CPU(object_new(TYPE_X86_CPU));
|
||||||
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
if (icc_bridge == NULL) {
|
||||||
|
error_setg(&error, "Invalid icc-bridge value");
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
qdev_set_parent_bus(DEVICE(cpu), qdev_get_child_bus(icc_bridge, "icc"));
|
||||||
|
object_unref(OBJECT(cpu));
|
||||||
|
#endif
|
||||||
env = &cpu->env;
|
env = &cpu->env;
|
||||||
env->cpu_model_str = cpu_model;
|
env->cpu_model_str = cpu_model;
|
||||||
|
|
||||||
|
@ -1659,7 +1669,7 @@ X86CPU *cpu_x86_init(const char *cpu_model)
|
||||||
Error *error = NULL;
|
Error *error = NULL;
|
||||||
X86CPU *cpu;
|
X86CPU *cpu;
|
||||||
|
|
||||||
cpu = cpu_x86_create(cpu_model, &error);
|
cpu = cpu_x86_create(cpu_model, NULL, &error);
|
||||||
if (error) {
|
if (error) {
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -2346,6 +2356,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
||||||
xcc->parent_realize = dc->realize;
|
xcc->parent_realize = dc->realize;
|
||||||
dc->realize = x86_cpu_realizefn;
|
dc->realize = x86_cpu_realizefn;
|
||||||
|
dc->bus_type = TYPE_ICC_BUS;
|
||||||
|
|
||||||
xcc->parent_reset = cc->reset;
|
xcc->parent_reset = cc->reset;
|
||||||
cc->reset = x86_cpu_reset;
|
cc->reset = x86_cpu_reset;
|
||||||
|
|
|
@ -897,7 +897,8 @@ typedef struct CPUX86State {
|
||||||
#include "cpu-qom.h"
|
#include "cpu-qom.h"
|
||||||
|
|
||||||
X86CPU *cpu_x86_init(const char *cpu_model);
|
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);
|
int cpu_x86_exec(CPUX86State *s);
|
||||||
void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf);
|
void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf);
|
||||||
void x86_cpudef_setup(void);
|
void x86_cpudef_setup(void);
|
||||||
|
|
Loading…
Reference in a new issue