[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC qom-cpu v2 02/28] target-alpha: Update AlphaCPU to QOM
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC qom-cpu v2 02/28] target-alpha: Update AlphaCPU to QOM realizefn |
Date: |
Sun, 20 Jan 2013 08:22:25 +0100 |
Update the alpha_cpu_realize() signature and hook up to
DeviceClass::realize. Set realized = true in cpu_alpha_init().
qapi/error.h is included through qdev now and no longer needed.
Signed-off-by: Andreas Färber <address@hidden>
---
target-alpha/cpu-qom.h | 2 ++
target-alpha/cpu.c | 21 +++++++++++++++++----
2 Dateien geändert, 19 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h
index 16367d2..c0f6c6d 100644
--- a/target-alpha/cpu-qom.h
+++ b/target-alpha/cpu-qom.h
@@ -34,6 +34,7 @@
/**
* AlphaCPUClass:
+ * @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler.
*
* An Alpha CPU model.
@@ -43,6 +44,7 @@ typedef struct AlphaCPUClass {
CPUClass parent_class;
/*< public >*/
+ DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu);
} AlphaCPUClass;
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index 40e9809..9222731 100644
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -21,14 +21,16 @@
#include "cpu.h"
#include "qemu-common.h"
-#include "qapi/error.h"
-static void alpha_cpu_realize(Object *obj, Error **errp)
+static void alpha_cpu_realizefn(DeviceState *dev, Error **errp)
{
- AlphaCPU *cpu = ALPHA_CPU(obj);
+ AlphaCPU *cpu = ALPHA_CPU(dev);
+ AlphaCPUClass *acc = ALPHA_CPU_GET_CLASS(dev);
qemu_init_vcpu(&cpu->env);
+
+ acc->parent_realize(dev, errp);
}
/* Sort alphabetically by type name. */
@@ -130,7 +132,8 @@ AlphaCPU *cpu_alpha_init(const char *cpu_model)
env->cpu_model_str = cpu_model;
- alpha_cpu_realize(OBJECT(cpu), NULL);
+ object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
+
return cpu;
}
@@ -244,6 +247,15 @@ static void alpha_cpu_initfn(Object *obj)
env->fen = 1;
}
+static void alpha_cpu_class_init(ObjectClass *oc, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(oc);
+ AlphaCPUClass *acc = ALPHA_CPU_CLASS(oc);
+
+ acc->parent_realize = dc->realize;
+ dc->realize = alpha_cpu_realizefn;
+}
+
static const TypeInfo alpha_cpu_type_info = {
.name = TYPE_ALPHA_CPU,
.parent = TYPE_CPU,
@@ -251,6 +263,7 @@ static const TypeInfo alpha_cpu_type_info = {
.instance_init = alpha_cpu_initfn,
.abstract = true,
.class_size = sizeof(AlphaCPUClass),
+ .class_init = alpha_cpu_class_init,
};
static void alpha_cpu_register_types(void)
--
1.7.10.4
- [Qemu-devel] [RFC qom-cpu v2 00/28] CPUState QOM realizefn support, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 01/28] cpu: Prepare QOM realizefn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 02/28] target-alpha: Update AlphaCPU to QOM realizefn,
Andreas Färber <=
- [Qemu-devel] [RFC qom-cpu v2 03/28] target-arm: Update ARMCPU to QOM realizefn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 04/28] target-i386: Update X86CPU to QOM realizefn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 08/28] target-lm32: Introduce QOM realizefn for LM32CPU, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 07/28] target-cris: Introduce QOM realizefn for CRISCPU, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 06/28] target-ppc: Update PowerPCCPU to QOM realizefn, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 09/28] target-m68k: Introduce QOM realizefn for M68kCPU, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 11/28] target-mips: Introduce QOM realizefn for MIPSCPU, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 13/28] target-sh4: Introduce QOM realizefn for SuperHCPU, Andreas Färber, 2013/01/20
- [Qemu-devel] [RFC qom-cpu v2 12/28] target-s390x: Introduce QOM realizefn for S390CPU, Andreas Färber, 2013/01/20