[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState |
Date: |
Wed, 5 Dec 2012 14:49:13 -0200 |
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 <address@hidden>
---
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),
--
1.7.11.7
- [Qemu-devel] [PATCH 0/8] CPU DeviceState v10, Eduardo Habkost, 2012/12/05
- [Qemu-devel] [PATCH 2/8] libqemustub: Add qemu_[un]register_reset() stubs, Eduardo Habkost, 2012/12/05
- [Qemu-devel] [PATCH 4/8] libqemustub: sysbus_get_default() stub, Eduardo Habkost, 2012/12/05
- [Qemu-devel] [PATCH 5/8] qdev: Coding style fixes, Eduardo Habkost, 2012/12/05
- [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState,
Eduardo Habkost <=
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Andreas Färber, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Eduardo Habkost, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Igor Mammedov, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Eduardo Habkost, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Andreas Färber, 2012/12/14
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Paolo Bonzini, 2012/12/14
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Andreas Färber, 2012/12/14
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Eduardo Habkost, 2012/12/14
[Qemu-devel] [PATCH 7/8] include qdev code into *-user, too, Eduardo Habkost, 2012/12/05
[Qemu-devel] [PATCH 3/8] libqemustub: vmstate register/unregister stubs, Eduardo Habkost, 2012/12/05