[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/17] cpu: Change parent type to Device
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 06/17] cpu: Change parent type to Device |
Date: |
Tue, 8 Jan 2013 21:56:23 +0100 |
From: Eduardo Habkost <address@hidden>
This finally makes the CPU class a subclass of the Device class,
allowing us to start using DeviceState properties on CPU subclasses.
It has no_user=1, as creating CPUs using -device doesn't work yet.
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
include/qom/cpu.h | 6 +++---
qom/cpu.c | 6 ++++--
2 Dateien geändert, 7 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 3e9fc3a..fbacb27 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -20,7 +20,7 @@
#ifndef QEMU_CPU_H
#define QEMU_CPU_H
-#include "qom/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);
@@ -66,7 +66,7 @@ struct kvm_run;
*/
struct CPUState {
/*< private >*/
- Object parent_obj;
+ DeviceState parent_obj;
/*< public >*/
struct QemuThread *thread;
diff --git a/qom/cpu.c b/qom/cpu.c
index d4d436f..49e5134 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -36,14 +36,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 = {
+static const 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.10.4
- [Qemu-devel] [PULL] QOM CPUState patch queue 2013-01-08, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 02/17] libqemustub: vmstate register/unregister stubs, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 03/17] libqemustub: sysbus_get_default() stub, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 01/17] libqemustub: Add qemu_[un]register_reset() stubs, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 05/17] qdev: Don't assume existence of parent bus on unparenting, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 04/17] qdev: Include qdev code into *-user, too, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 06/17] cpu: Change parent type to Device,
Andreas Färber <=
- [Qemu-devel] [PATCH 08/17] target-i386: kvm: Enable all supported KVM features for -cpu host, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 07/17] target-i386: kvm: -cpu host: Use GET_SUPPORTED_CPUID for SVM features, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 09/17] target-i386: check/enforce: Fix CPUID leaf numbers on error messages, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 10/17] target-i386: check/enforce: Do not ignore "hypervisor" flag, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 12/17] target-i386: check/enforce: Check SVM flag support as well, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 11/17] target-i386: check/enforce: Check all CPUID.80000001H.EDX bits, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 13/17] target-i386: check/enforce: Eliminate check_feat field, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 16/17] target-i386: Sanitize AMD's ext2_features at realize time, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 15/17] target-i386: Filter out unsupported features at realize time, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 14/17] qemu-common.h: Make qemu_init_vcpu() stub static inline, Andreas Färber, 2013/01/08