[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv2 04/10] pseries: Remove versions from mc->desc
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCHv2 04/10] pseries: Remove versions from mc->desc |
Date: |
Mon, 7 Dec 2015 14:34:34 +1100 |
Currently, the versioned spapr machine types put the machine type version
into the description string. PC does not do this, using just the name
itself to distinguish. Doing the same lets us move setting the description
into the common base class, simplifying the code slightly.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c7c6517..b08d338 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2265,6 +2265,7 @@ static void spapr_machine_class_init(ObjectClass *oc,
void *data)
NMIClass *nc = NMI_CLASS(oc);
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
+ mc->desc = "pSeries Logical Partition (PAPR compliant)";
mc->init = ppc_spapr_init;
mc->reset = ppc_spapr_reset;
mc->block_default_type = IF_SCSI;
@@ -2309,7 +2310,6 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc,
void *data)
MachineClass *mc = MACHINE_CLASS(oc);
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc);
- mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5";
mc->alias = "pseries";
mc->is_default = 1;
smc->dr_lmb_enabled = true;
@@ -2335,7 +2335,6 @@ static void spapr_machine_2_4_class_init(ObjectClass *oc,
void *data)
};
MachineClass *mc = MACHINE_CLASS(oc);
- mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4";
mc->compat_props = compat_props;
}
@@ -2376,7 +2375,6 @@ static void spapr_machine_2_3_class_init(ObjectClass *oc,
void *data)
};
MachineClass *mc = MACHINE_CLASS(oc);
- mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3";
mc->compat_props = compat_props;
}
@@ -2418,7 +2416,6 @@ static void spapr_machine_2_2_class_init(ObjectClass *oc,
void *data)
};
MachineClass *mc = MACHINE_CLASS(oc);
- mc->desc = "pSeries Logical Partition (PAPR compliant) v2.2";
mc->compat_props = compat_props;
}
@@ -2454,7 +2451,6 @@ static void spapr_machine_2_1_class_init(ObjectClass *oc,
void *data)
{ /* end of list */ }
};
- mc->desc = "pSeries Logical Partition (PAPR compliant) v2.1";
mc->compat_props = compat_props;
}
--
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 <=
- [Qemu-devel] [PATCHv2 06/10] pseries: Use SET_MACHINE_COMPAT, David Gibson, 2015/12/06
- [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