From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3F9P-0006ib-Ec for qemu-devel@nongnu.org; Sun, 19 Aug 2012 19:43:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3F9O-0006Ut-Gb for qemu-devel@nongnu.org; Sun, 19 Aug 2012 19:43:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3F9O-0006Uo-8k for qemu-devel@nongnu.org; Sun, 19 Aug 2012 19:43:22 -0400 From: Igor Mammedov Date: Mon, 20 Aug 2012 01:39:39 +0200 Message-Id: <1345419579-25499-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1345419579-25499-1-git-send-email-imammedo@redhat.com> References: <1345419579-25499-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] make CPU a child of DeviceState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jan.kiszka@siemens.com, mjt@tls.msk.ru, armbru@redhat.com, blauwirbel@gmail.com, kraxel@redhat.com, xen-devel@lists.xensource.com, i.mitsyanko@samsung.com, mdroth@linux.vnet.ibm.com, avi@redhat.com, anthony.perard@citrix.com, lersek@redhat.com, stefanha@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, sw@weilnetz.de, lcapitulino@redhat.com, rth@twiddle.net, kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, pbonzini@redhat.com, afaerber@suse.de Signed-off-by: Igor Mammedov --- include/qemu/cpu.h | 6 +++--- 1 files changed, 3 insertions(+), 3 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; -- 1.7.1