From patchwork Tue Oct 16 01:57:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [12/12] qom: make CPU a child of DeviceState Date: Mon, 15 Oct 2012 15:57:24 -0000 From: Igor Mammedov X-Patchwork-Id: 191712 Message-Id: <1350352644-14436-13-git-send-email-imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, aliguori@us.ibm.com, afaerber@suse.de, ehabkost@redhat.com Signed-off-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- [ehabkost: change CPU type declaration to have TYPE_DEVICE as parent] --- include/qemu/cpu.h | 6 +++--- qom/cpu.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index ad706a6..ac44057 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -20,7 +20,7 @@ #ifndef QEMU_CPU_H #define QEMU_CPU_H -#include "qemu/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); @@ -59,7 +59,7 @@ typedef struct CPUClass { */ struct CPUState { /*< private >*/ - Object parent_obj; + DeviceState parent_obj; /*< public >*/ struct QemuThread *thread; diff --git a/qom/cpu.c b/qom/cpu.c index 5b36046..f59db7d 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -20,6 +20,7 @@ #include "qemu/cpu.h" #include "qemu-common.h" +#include "hw/qdev-core.h" void cpu_reset(CPUState *cpu) { @@ -43,7 +44,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) static TypeInfo cpu_type_info = { .name = TYPE_CPU, - .parent = TYPE_OBJECT, + .parent = TYPE_DEVICE, .instance_size = sizeof(CPUState), .abstract = true, .class_size = sizeof(CPUClass),