From patchwork Tue Aug 21 15:43:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 179080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CCC882C0099 for ; Wed, 22 Aug 2012 01:42:22 +1000 (EST) Received: from localhost ([::1]:60115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3qay-00076l-VE for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2012 11:42:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3qaq-0006yY-B7 for qemu-devel@nongnu.org; Tue, 21 Aug 2012 11:42:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3qan-0005vw-N5 for qemu-devel@nongnu.org; Tue, 21 Aug 2012 11:42:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3qan-0005vU-EE for qemu-devel@nongnu.org; Tue, 21 Aug 2012 11:42:09 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7LFg0No017856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 21 Aug 2012 11:42:00 -0400 Received: from blackpad.lan.raisama.net (vpn1-6-72.gru2.redhat.com [10.97.6.72]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7LFfx4Y006368; Tue, 21 Aug 2012 11:41:59 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 9AE2920286A; Tue, 21 Aug 2012 12:43:09 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2012 12:43:02 -0300 Message-Id: <1345563782-11224-9-git-send-email-ehabkost@redhat.com> In-Reply-To: <1345563782-11224-1-git-send-email-ehabkost@redhat.com> References: <1345563782-11224-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 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 Subject: [Qemu-devel] [RFC 8/8] make CPU a child of DeviceState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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),