From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [RFC 8/8] make CPU a child of DeviceState Date: Tue, 21 Aug 2012 12:43:02 -0300 Message-ID: <1345563782-11224-9-git-send-email-ehabkost@redhat.com> References: <1345563782-11224-1-git-send-email-ehabkost@redhat.com> Return-path: In-Reply-To: <1345563782-11224-1-git-send-email-ehabkost@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jan.kiszka@siemens.com, mjt@tls.msk.ru, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, kraxel@redhat.com, xen-devel@lists.xensource.com, i.mitsyanko@samsung.com, armbru@redhat.com, avi@redhat.com, anthony.perard@citrix.com, lersek@redhat.com, stefanha@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, sw@weilnetz.de, imammedo@redhat.com, lcapitulino@redhat.com, rth@twiddle.net, kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, pbonzini@redhat.com, afaerber@suse.de List-Id: xen-devel@lists.xenproject.org From: Igor Mammedov [ehabkost: change CPU type declaration to hae TYPE_DEVICE as parent] Signed-off-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- 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), -- 1.7.11.4