diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2012-12-05 14:49:13 -0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-01-08 21:03:44 +0100 |
commit | 961f839570f01d60a0b224248e6e56fc1d675793 (patch) | |
tree | e05518306d7e5b792556518a32b7e57251fa3004 | |
parent | 5d5b24d042072fb4d13e7027f6e52e44390a9896 (diff) | |
download | hqemu-961f839570f01d60a0b224248e6e56fc1d675793.zip hqemu-961f839570f01d60a0b224248e6e56fc1d675793.tar.gz |
cpu: Change parent type to Device
This finally makes the CPU class a subclass of the Device class,
allowing us to start using DeviceState properties on CPU subclasses.
It has no_user=1, as creating CPUs using -device doesn't work yet.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r-- | include/qom/cpu.h | 6 | ||||
-rw-r--r-- | qom/cpu.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 3e9fc3a..fbacb27 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -20,7 +20,7 @@ #ifndef QEMU_CPU_H #define QEMU_CPU_H -#include "qom/object.h" +#include "hw/qdev-core.h" #include "qemu/thread.h" /** @@ -46,7 +46,7 @@ typedef struct CPUState CPUState; */ typedef struct CPUClass { /*< private >*/ - ObjectClass parent_class; + DeviceClass parent_class; /*< public >*/ void (*reset)(CPUState *cpu); @@ -66,7 +66,7 @@ struct kvm_run; */ struct CPUState { /*< private >*/ - Object parent_obj; + DeviceState parent_obj; /*< public >*/ struct QemuThread *thread; @@ -36,14 +36,16 @@ static void cpu_common_reset(CPUState *cpu) static void cpu_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); CPUClass *k = CPU_CLASS(klass); k->reset = cpu_common_reset; + dc->no_user = 1; } -static TypeInfo cpu_type_info = { +static const TypeInfo cpu_type_info = { .name = TYPE_CPU, - .parent = TYPE_OBJECT, + .parent = TYPE_DEVICE, .instance_size = sizeof(CPUState), .abstract = true, .class_size = sizeof(CPUClass), |