[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [RFC 3/9] spapr: DEFINE_SPAPR_MACHINE
|
From: |
David Gibson |
|
Subject: |
[Qemu-ppc] [RFC 3/9] spapr: DEFINE_SPAPR_MACHINE |
|
Date: |
Mon, 30 Nov 2015 19:51:44 +1100 |
At the moment all the class_init functions and TypeInfo structures for the
various versioned pseries machine types are open-coded. As more versions
are created this is getting increasingly clumsy.
This patch borrows the approach used in PC, using a DEFINE_SPAPR_MACHINE()
macro to construct most of the boilerplate from simpler 'class_compat' and
'instance_compat' functions.
This patch makes a small semantic change - the versioned machine types are
now registered through machine_init() instead of type_init(). Since the
new way is how PC already did it, I'm assuming that's correct.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 114 ++++++++++++++++++++++-----------------------------------
1 file changed, 44 insertions(+), 70 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c126e10..ca62343 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2301,13 +2301,40 @@ static const TypeInfo spapr_machine_info = {
},
};
+#define DEFINE_SPAPR_MACHINE(suffix, verstr, instance_compat) \
+ static void spapr_machine_##suffix##_class_init(ObjectClass *oc, \
+ void *data) \
+ { \
+ MachineClass *mc = MACHINE_CLASS(oc); \
+ spapr_machine_##suffix##_class_compat(mc); \
+ } \
+ static void spapr_machine_##suffix##_instance_init(Object *obj) \
+ { \
+ void (*compat)(MachineState *m) = (instance_compat); \
+ MachineState *machine = MACHINE(obj); \
+ if (compat) { \
+ compat(machine); \
+ } \
+ spapr_machine_initfn(obj); \
+ } \
+ static const TypeInfo spapr_machine_##suffix##_info = { \
+ .name = MACHINE_TYPE_NAME("pseries-" verstr), \
+ .parent = TYPE_SPAPR_MACHINE, \
+ .class_init = spapr_machine_##suffix##_class_init, \
+ .instance_init = spapr_machine_##suffix##_instance_init, \
+ }; \
+ static void spapr_machine_register_##suffix(void) \
+ { \
+ type_register(&spapr_machine_##suffix##_info); \
+ } \
+ machine_init(spapr_machine_register_##suffix)
+
/*
* pseries-2.5
*/
-static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data)
+static void spapr_machine_2_5_class_compat(MachineClass *mc)
{
- MachineClass *mc = MACHINE_CLASS(oc);
- sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc);
+ sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5";
mc->alias = "pseries";
@@ -2315,11 +2342,7 @@ static void spapr_machine_2_5_class_init(ObjectClass
*oc, void *data)
smc->dr_lmb_enabled = true;
}
-static const TypeInfo spapr_machine_2_5_info = {
- .name = MACHINE_TYPE_NAME("pseries-2.5"),
- .parent = TYPE_SPAPR_MACHINE,
- .class_init = spapr_machine_2_5_class_init,
-};
+DEFINE_SPAPR_MACHINE(2_5, "2.5", NULL);
/*
* pseries-2.4
@@ -2327,23 +2350,18 @@ static const TypeInfo spapr_machine_2_5_info = {
#define SPAPR_COMPAT_2_4 \
HW_COMPAT_2_4
-static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data)
+static void spapr_machine_2_4_class_compat(MachineClass *mc)
{
static GlobalProperty compat_props[] = {
SPAPR_COMPAT_2_4
{ /* end of list */ }
};
- MachineClass *mc = MACHINE_CLASS(oc);
mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4";
mc->compat_props = compat_props;
}
-static const TypeInfo spapr_machine_2_4_info = {
- .name = MACHINE_TYPE_NAME("pseries-2.4"),
- .parent = TYPE_SPAPR_MACHINE,
- .class_init = spapr_machine_2_4_class_init,
-};
+DEFINE_SPAPR_MACHINE(2_4, "2.4", NULL);
/*
* pseries-2.3
@@ -2357,36 +2375,23 @@ static const TypeInfo spapr_machine_2_4_info = {
.value = "off",\
},
-static void spapr_compat_2_3(Object *obj)
+static void spapr_machine_2_3_instance_compat(MachineState *machine)
{
savevm_skip_section_footers();
global_state_set_optional();
}
-static void spapr_machine_2_3_instance_init(Object *obj)
-{
- spapr_compat_2_3(obj);
- spapr_machine_initfn(obj);
-}
-
-static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data)
+static void spapr_machine_2_3_class_compat(MachineClass *mc)
{
static GlobalProperty compat_props[] = {
SPAPR_COMPAT_2_3
{ /* end of list */ }
};
- MachineClass *mc = MACHINE_CLASS(oc);
mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3";
mc->compat_props = compat_props;
}
-
-static const TypeInfo spapr_machine_2_3_info = {
- .name = MACHINE_TYPE_NAME("pseries-2.3"),
- .parent = TYPE_SPAPR_MACHINE,
- .class_init = spapr_machine_2_3_class_init,
- .instance_init = spapr_machine_2_3_instance_init,
-};
+DEFINE_SPAPR_MACHINE(2_3, "2.3", spapr_machine_2_3_instance_compat);
/*
* pseries-2.2
@@ -2401,35 +2406,22 @@ static const TypeInfo spapr_machine_2_3_info = {
.value = "0x20000000",\
},
-static void spapr_compat_2_2(Object *obj)
+static void spapr_machine_2_2_instance_compat(MachineState *machine)
{
- spapr_compat_2_3(obj);
+ spapr_machine_2_3_instance_compat(machine);
}
-static void spapr_machine_2_2_instance_init(Object *obj)
-{
- spapr_compat_2_2(obj);
- spapr_machine_initfn(obj);
-}
-
-static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data)
+static void spapr_machine_2_2_class_compat(MachineClass *mc)
{
static GlobalProperty compat_props[] = {
SPAPR_COMPAT_2_2
{ /* end of list */ }
};
- MachineClass *mc = MACHINE_CLASS(oc);
mc->desc = "pSeries Logical Partition (PAPR compliant) v2.2";
mc->compat_props = compat_props;
}
-
-static const TypeInfo spapr_machine_2_2_info = {
- .name = MACHINE_TYPE_NAME("pseries-2.2"),
- .parent = TYPE_SPAPR_MACHINE,
- .class_init = spapr_machine_2_2_class_init,
- .instance_init = spapr_machine_2_2_instance_init,
-};
+DEFINE_SPAPR_MACHINE(2_2, "2.2", spapr_machine_2_2_instance_compat);
/*
* pseries-2.1
@@ -2438,20 +2430,13 @@ static const TypeInfo spapr_machine_2_2_info = {
SPAPR_COMPAT_2_2 \
HW_COMPAT_2_1
-static void spapr_compat_2_1(Object *obj)
+static void spapr_machine_2_1_instance_compat(MachineState *machine)
{
- spapr_compat_2_2(obj);
+ spapr_machine_2_2_instance_compat(machine);
}
-static void spapr_machine_2_1_instance_init(Object *obj)
+static void spapr_machine_2_1_class_compat(MachineClass *mc)
{
- spapr_compat_2_1(obj);
- spapr_machine_initfn(obj);
-}
-
-static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data)
-{
- MachineClass *mc = MACHINE_CLASS(oc);
static GlobalProperty compat_props[] = {
SPAPR_COMPAT_2_1
{ /* end of list */ }
@@ -2460,22 +2445,11 @@ static void spapr_machine_2_1_class_init(ObjectClass
*oc, void *data)
mc->desc = "pSeries Logical Partition (PAPR compliant) v2.1";
mc->compat_props = compat_props;
}
-
-static const TypeInfo spapr_machine_2_1_info = {
- .name = MACHINE_TYPE_NAME("pseries-2.1"),
- .parent = TYPE_SPAPR_MACHINE,
- .class_init = spapr_machine_2_1_class_init,
- .instance_init = spapr_machine_2_1_instance_init,
-};
+DEFINE_SPAPR_MACHINE(2_1, "2.1", spapr_machine_2_1_instance_compat);
static void spapr_machine_register_types(void)
{
type_register_static(&spapr_machine_info);
- type_register_static(&spapr_machine_2_1_info);
- type_register_static(&spapr_machine_2_2_info);
- type_register_static(&spapr_machine_2_3_info);
- type_register_static(&spapr_machine_2_4_info);
- type_register_static(&spapr_machine_2_5_info);
}
type_init(spapr_machine_register_types)
--
2.5.0
[Qemu-ppc] [RFC 8/9] spapr: Improve setting of default machine version, David Gibson, 2015/11/30
[Qemu-ppc] [RFC 2/9] spapr: Rearrange versioned machine type code, David Gibson, 2015/11/30
[Qemu-ppc] [RFC 4/9] Move SET_MACHINE_COMPAT macro to boards.h, David Gibson, 2015/11/30