[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v1 5/7] target-arm: Remove ARMCPUClass
From: |
peter . crosthwaite |
Subject: |
[Qemu-devel] [RFC PATCH v1 5/7] target-arm: Remove ARMCPUClass |
Date: |
Tue, 18 Jun 2013 19:47:06 +1000 |
From: Peter Crosthwaite <address@hidden>
ARMCPUClass is only needed for super-class abstract function access.
Just use Super classes for reset and realize access and remove
ARMCPUClass completely.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
target-arm/cpu-qom.h | 20 --------------------
target-arm/cpu.c | 14 +++++---------
2 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h
index 12fcefe..c937cd7 100644
--- a/target-arm/cpu-qom.h
+++ b/target-arm/cpu-qom.h
@@ -24,28 +24,8 @@
#define TYPE_ARM_CPU "arm-cpu"
-#define ARM_CPU_CLASS(klass) \
- OBJECT_CLASS_CHECK(ARMCPUClass, (klass), TYPE_ARM_CPU)
#define ARM_CPU(obj) \
OBJECT_CHECK(ARMCPU, (obj), TYPE_ARM_CPU)
-#define ARM_CPU_GET_CLASS(obj) \
- OBJECT_GET_CLASS(ARMCPUClass, (obj), TYPE_ARM_CPU)
-
-/**
- * ARMCPUClass:
- * @parent_realize: The parent class' realize handler.
- * @parent_reset: The parent class' reset handler.
- *
- * An ARM CPU model.
- */
-typedef struct ARMCPUClass {
- /*< private >*/
- CPUClass parent_class;
- /*< public >*/
-
- DeviceRealize parent_realize;
- void (*parent_reset)(CPUState *cpu);
-} ARMCPUClass;
/**
* ARMCPU:
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 47a21ec..a64de0f 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -60,7 +60,7 @@ static void cp_reg_reset(gpointer key, gpointer value,
gpointer opaque)
static void arm_cpu_reset(CPUState *s)
{
ARMCPU *cpu = ARM_CPU(s);
- ARMCPUClass *acc = ARM_CPU_GET_CLASS(cpu);
+ CPUClass *cc_super = CPU_GET_SUPER_CLASS(cpu, TYPE_ARM_CPU);
CPUARMState *env = &cpu->env;
if (qemu_loglevel_mask(CPU_LOG_RESET)) {
@@ -68,7 +68,7 @@ static void arm_cpu_reset(CPUState *s)
log_cpu_state(env, 0);
}
- acc->parent_reset(s);
+ cc_super->reset(s);
memset(env, 0, offsetof(CPUARMState, breakpoints));
g_hash_table_foreach(cpu->cp_regs, cp_reg_reset, cpu);
@@ -158,7 +158,7 @@ static void arm_cpu_finalizefn(Object *obj)
static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
{
ARMCPU *cpu = ARM_CPU(dev);
- ARMCPUClass *acc = ARM_CPU_GET_CLASS(dev);
+ DeviceClass *dc_super = DEVICE_GET_SUPER_CLASS(dev, TYPE_ARM_CPU);
CPUARMState *env = &cpu->env;
/* Some features automatically imply others: */
@@ -207,7 +207,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error
**errp)
cpu_reset(CPU(cpu));
qemu_init_vcpu(env);
- acc->parent_realize(dev, errp);
+ dc_super->realize(dev, errp);
}
/* CPU models */
@@ -802,14 +802,11 @@ static const ARMCPUInfo arm_cpus[] = {
static void arm_cpu_class_init(ObjectClass *oc, void *data)
{
- ARMCPUClass *acc = ARM_CPU_CLASS(oc);
- CPUClass *cc = CPU_CLASS(acc);
+ CPUClass *cc = CPU_CLASS(oc);
DeviceClass *dc = DEVICE_CLASS(oc);
- acc->parent_realize = dc->realize;
dc->realize = arm_cpu_realizefn;
- acc->parent_reset = cc->reset;
cc->reset = arm_cpu_reset;
cc->class_by_name = arm_cpu_class_by_name;
@@ -837,7 +834,6 @@ static const TypeInfo arm_cpu_type_info = {
.instance_init = arm_cpu_initfn,
.instance_finalize = arm_cpu_finalizefn,
.abstract = true,
- .class_size = sizeof(ARMCPUClass),
.class_init = arm_cpu_class_init,
};
--
1.8.3.rc1.44.gb387c77.dirty
- [Qemu-devel] [RFC PATCH v1 0/7] QOM Super class access, peter . crosthwaite, 2013/06/18
- [Qemu-devel] [RFC PATCH v1 1/7] target-arm/cpu.c: delete un-needed instance/class sizes, peter . crosthwaite, 2013/06/18
- [Qemu-devel] [RFC PATCH v1 2/7] qom: Add super class accessor, peter . crosthwaite, 2013/06/18
- [Qemu-devel] [RFC PATCH v1 3/7] qdev-core: Introduce DEVICE super class cast macros, peter . crosthwaite, 2013/06/18
- [Qemu-devel] [RFC PATCH v1 4/7] qom/cpu: Introduce CPU super class cast macros, peter . crosthwaite, 2013/06/18
- [Qemu-devel] [RFC PATCH v1 5/7] target-arm: Remove ARMCPUClass,
peter . crosthwaite <=
- [Qemu-devel] [RFC PATCH v1 6/7] target-microblaze: Remove MicroblazeCPUClass, peter . crosthwaite, 2013/06/18
- [Qemu-devel] [RFC PATCH v1 7/7] i8254: Remove [KVM]PITClass, peter . crosthwaite, 2013/06/18
- Re: [Qemu-devel] [RFC PATCH v1 0/7] QOM Super class access, Andreas Färber, 2013/06/18
- Re: [Qemu-devel] [RFC PATCH v1 0/7] QOM Super class access, Michael S. Tsirkin, 2013/06/18