From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfsOD-0007bu-O3 for qemu-devel@nongnu.org; Tue, 04 Dec 2012 08:18:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfsO3-0000Jb-UB for qemu-devel@nongnu.org; Tue, 04 Dec 2012 08:18:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfsO3-0000Iq-Kj for qemu-devel@nongnu.org; Tue, 04 Dec 2012 08:18:11 -0500 From: Eduardo Habkost Date: Tue, 4 Dec 2012 11:19:40 -0200 Message-Id: <1354627180-25704-9-git-send-email-ehabkost@redhat.com> In-Reply-To: <1354627180-25704-1-git-send-email-ehabkost@redhat.com> References: <1354627180-25704-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 8/8] qom: make CPU a child of DeviceState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Paolo Bonzini From: Igor Mammedov Signed-off-by: Igor Mammedov [ehabkost: change CPU type declaration to hae TYPE_DEVICE as parent] Signed-off-by: Eduardo Habkost --- Yes, there is "changelog" data before the "---" mark, but I believe that in this case they are important to indicate authorship and the scope of the Signed-off-by lines (so they need to get into the git commit message). --- 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 61b7698..bc004fd 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); @@ -62,7 +62,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.7