[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv2 06/10] pseries: Use SET_MACHINE_COMPAT
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCHv2 06/10] pseries: Use SET_MACHINE_COMPAT |
Date: |
Mon, 7 Dec 2015 14:34:36 +1100 |
To make the spapr_machine_*_class_init() functions a little less bulky.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b08d338..3078e60 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2329,13 +2329,9 @@ static const TypeInfo spapr_machine_2_5_info = {
static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data)
{
- static GlobalProperty compat_props[] = {
- SPAPR_COMPAT_2_4
- { /* end of list */ }
- };
MachineClass *mc = MACHINE_CLASS(oc);
- mc->compat_props = compat_props;
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_4);
}
static const TypeInfo spapr_machine_2_4_info = {
@@ -2369,13 +2365,9 @@ static void spapr_machine_2_3_instance_init(Object *obj)
static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data)
{
- static GlobalProperty compat_props[] = {
- SPAPR_COMPAT_2_3
- { /* end of list */ }
- };
MachineClass *mc = MACHINE_CLASS(oc);
- mc->compat_props = compat_props;
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_3);
}
static const TypeInfo spapr_machine_2_3_info = {
@@ -2410,13 +2402,9 @@ static void spapr_machine_2_2_instance_init(Object *obj)
static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data)
{
- static GlobalProperty compat_props[] = {
- SPAPR_COMPAT_2_2
- { /* end of list */ }
- };
MachineClass *mc = MACHINE_CLASS(oc);
- mc->compat_props = compat_props;
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_2);
}
static const TypeInfo spapr_machine_2_2_info = {
@@ -2446,12 +2434,8 @@ static void spapr_machine_2_1_instance_init(Object *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 */ }
- };
- mc->compat_props = compat_props;
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_1);
}
static const TypeInfo spapr_machine_2_1_info = {
--
2.5.0
- [Qemu-devel] [PATCHv2 00/10] Clean up pseries machine versioning, David Gibson, 2015/12/06
- [Qemu-devel] [PATCHv2 01/10] pseries: Remove redundant setting of mc->name for pseries-2.5 machine, David Gibson, 2015/12/06
- [Qemu-devel] [PATCHv2 03/10] pseries: Remove redundant calls to spapr_machine_initfn(), David Gibson, 2015/12/06
- [Qemu-devel] [PATCHv2 04/10] pseries: Remove versions from mc->desc, David Gibson, 2015/12/06
- [Qemu-devel] [PATCHv2 06/10] pseries: Use SET_MACHINE_COMPAT,
David Gibson <=
- [Qemu-devel] [PATCHv2 09/10] pseries: Improve setting of default machine version, David Gibson, 2015/12/06
- [Qemu-devel] [PATCHv2 05/10] Move SET_MACHINE_COMPAT macro to boards.h, David Gibson, 2015/12/06
- [Qemu-devel] [PATCHv2 08/10] pseries: Restructure class_options functions, David Gibson, 2015/12/06
- [Qemu-devel] [PATCHv2 02/10] pseries: Rearrange versioned machine type code, David Gibson, 2015/12/06