From patchwork Wed Dec 5 16:49:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 203902 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 A807A2C00A3 for ; Thu, 6 Dec 2012 03:48:34 +1100 (EST) Received: from localhost ([::1]:57451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgI9A-0006oS-Pp for incoming@patchwork.ozlabs.org; Wed, 05 Dec 2012 11:48:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgI8m-0006Zw-Fi for qemu-devel@nongnu.org; Wed, 05 Dec 2012 11:48:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgI8a-00060i-Km for qemu-devel@nongnu.org; Wed, 05 Dec 2012 11:48:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgI8a-0005zr-BZ for qemu-devel@nongnu.org; Wed, 05 Dec 2012 11:47:56 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB5GltmU004730 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Dec 2012 11:47:55 -0500 Received: from blackpad.lan.raisama.net (vpn1-5-209.gru2.redhat.com [10.97.5.209]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qB5Glsx2020018; Wed, 5 Dec 2012 11:47:54 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 34C82202992; Wed, 5 Dec 2012 14:49:29 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 5 Dec 2012 14:49:13 -0200 Message-Id: <1354726153-30264-9-git-send-email-ehabkost@redhat.com> In-Reply-To: <1354726153-30264-1-git-send-email-ehabkost@redhat.com> References: <1354726153-30264-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov , Don Slutz , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 8/8] qom: 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 This finally makes the CPU class a child of DeviceState, allowing us to start using DeviceState properties on CPU subclasses. It has no_user=1, as creating CPUs using -device doesn't work yet. (based on a previous patch from Igor Mammedov) Signed-off-by: Eduardo Habkost --- Changes v1 (imammedo) -> v2 (ehabkost): - Change CPU type declaration to hae TYPE_DEVICE as parent Changes v2 -> v3 (ehabkost): - Set no_user=1 on the CPU class --- include/qemu/cpu.h | 6 +++--- qom/cpu.c | 5 ++++- 2 files changed, 7 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..d301f72 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) { @@ -36,14 +37,16 @@ static void cpu_common_reset(CPUState *cpu) static void cpu_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); CPUClass *k = CPU_CLASS(klass); k->reset = cpu_common_reset; + dc->no_user = 1; } static TypeInfo cpu_type_info = { .name = TYPE_CPU, - .parent = TYPE_OBJECT, + .parent = TYPE_DEVICE, .instance_size = sizeof(CPUState), .abstract = true, .class_size = sizeof(CPUClass),