[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/16] target-i386: cpu: attach ICC bus to CPU on it
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 12/16] target-i386: cpu: attach ICC bus to CPU on its creation |
Date: |
Tue, 16 Apr 2013 00:12:52 +0200 |
... during startup, so it would be possible to unplug it later
and set bus_type to TYPE_ICC_BUS for X86CPU type to make device_add
attach hotplugged CPU to ICC bus.
Signed-off-by: Igor Mammedov <address@hidden>
---
target-i386/cpu.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 6d6c527..3b5f90b 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -41,6 +41,7 @@
#endif
#include "sysemu/sysemu.h"
+#include "hw/i386/icc_bus.h"
#ifndef CONFIG_USER_ONLY
#include "hw/xen/xen.h"
#include "hw/sysbus.h"
@@ -1609,6 +1610,7 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error
**errp)
gchar **model_pieces;
char *name, *features;
Error *error = NULL;
+ Object *icc_bus = object_resolve_path_type("icc-bus", TYPE_ICC_BUS, NULL);
model_pieces = g_strsplit(cpu_model, ",", 2);
if (!model_pieces[0]) {
@@ -1619,6 +1621,10 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error
**errp)
features = model_pieces[1];
cpu = X86_CPU(object_new(TYPE_X86_CPU));
+ if (icc_bus) {
+ qdev_set_parent_bus(DEVICE(cpu), BUS(icc_bus));
+ object_unref(OBJECT(cpu));
+ }
env = &cpu->env;
env->cpu_model_str = cpu_model;
@@ -2330,6 +2336,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;
--
1.8.2
- Re: [Qemu-devel] [PATCH 09/16] acpi_piix4: add infrastructure to send CPU hot-plug GPE to guest, (continued)
[Qemu-devel] [PATCH 13/16] target-i386: replace MSI_SPACE_SIZE with APIC_SPACE_SIZE, Igor Mammedov, 2013/04/15
[Qemu-devel] [PATCH 14/16] target-i386: move APIC to ICC bus, Igor Mammedov, 2013/04/15
[Qemu-devel] [PATCH 15/16] target-i386: move IOAPIC to ICC bus, Igor Mammedov, 2013/04/15