[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] qom: make CPU a child of DeviceState
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 12/12] qom: make CPU a child of DeviceState |
Date: |
Tue, 16 Oct 2012 16:08:43 -0300 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
[ehabkost: change CPU type declaration to hae TYPE_DEVICE as parent]
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 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),
--
1.7.11.7
- [Qemu-devel] [PATCH 10/12] qdev: use full qdev.h include path on qdev*.c, (continued)
- [Qemu-devel] [PATCH 08/12] qdev: move reset register/unregister code to qdev-system.c, Eduardo Habkost, 2012/10/16
- [Qemu-devel] [PATCH 05/12] qdev-core: isolate vmstate handling into separate functions, Eduardo Habkost, 2012/10/16
- [Qemu-devel] [PATCH 09/12] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/10/16
- [Qemu-devel] [PATCH 12/12] qom: make CPU a child of DeviceState,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 04/12] qdev: rename qdev.c to qdev-core.c, Eduardo Habkost, 2012/10/16
- [Qemu-devel] [PATCH 03/12] qdev: separate core from the code used only by qemu-system-*, Eduardo Habkost, 2012/10/16
- [Qemu-devel] [PATCH 01/12] qdev: split up header so it can be used in cpu.h, Eduardo Habkost, 2012/10/16
- [Qemu-devel] [PATCH 11/12] include core qdev code into *-user, too, Eduardo Habkost, 2012/10/16
- Re: [Qemu-devel] [PATCH 11/12] include core qdev code into *-user, too, Igor Mammedov, 2012/10/22