[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/33] spapr: Create pseries-2.5 machine
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 02/33] spapr: Create pseries-2.5 machine |
Date: |
Mon, 21 Sep 2015 11:05:57 +1000 |
Add pseries-2.5 machine version.
Signed-off-by: Bharata B Rao <address@hidden>
[Altered to merge before memory hotplug -- dwg]
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index dd58eb4..668879f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1976,7 +1976,7 @@ static void spapr_machine_2_4_class_init(ObjectClass *oc,
void *data)
mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4";
mc->alias = "pseries";
- mc->is_default = 1;
+ mc->is_default = 0;
}
static const TypeInfo spapr_machine_2_4_info = {
@@ -1985,6 +1985,22 @@ static const TypeInfo spapr_machine_2_4_info = {
.class_init = spapr_machine_2_4_class_init,
};
+static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->name = "pseries-2.5";
+ mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5";
+ mc->alias = "pseries";
+ mc->is_default = 1;
+}
+
+static const TypeInfo spapr_machine_2_5_info = {
+ .name = TYPE_SPAPR_MACHINE "2.5",
+ .parent = TYPE_SPAPR_MACHINE,
+ .class_init = spapr_machine_2_5_class_init,
+};
+
static void spapr_machine_register_types(void)
{
type_register_static(&spapr_machine_info);
@@ -1992,6 +2008,7 @@ static void spapr_machine_register_types(void)
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.4.3
- [Qemu-devel] [PULL 00/33] spapr-next queue 2015-09-16, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 01/33] spapr: Provide an error message when migration fails due to htab_shift mismatch, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 08/33] spapr_drc: Fix potential undefined behaviour, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 05/33] spapr: Make ibm, change-msi respect 3 return values, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 10/33] spapr_rtas: Prevent QEMU crash during hotplug without a prior device_add, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 07/33] spapr: add dumpdtb support, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 03/33] spapr: Add /ibm,partition-name, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 06/33] spapr: SPLPAR Characteristics, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 04/33] spapr: Add /rtas/ibm, change-msix-capable, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 02/33] spapr: Create pseries-2.5 machine,
David Gibson <=
- [Qemu-devel] [PULL 11/33] sPAPR: Introduce rtas_ldq(), David Gibson, 2015/09/20
- [Qemu-devel] [PULL 12/33] pseries: define coldplugged devices as "configured", David Gibson, 2015/09/20
- [Qemu-devel] [PULL 09/33] ppc/spapr: Use qemu_log_mask() for hcall_dprintf(), David Gibson, 2015/09/20
- [Qemu-devel] [PULL 14/33] pseries: Fix incorrect calculation of threads per socket for chip-id, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 16/33] spapr_pci: fix device tree props for MSI/MSI-X, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 18/33] spapr: Initialize hotplug memory address space, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 17/33] spapr_drc: don't allow 'empty' DRCs to be unisolated or allocated, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 15/33] spapr: Enable in-kernel H_SET_MODE handling, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 21/33] spapr: Use QEMU limit for maximum CPUs number, David Gibson, 2015/09/20
- [Qemu-devel] [PULL 20/33] spapr: Don't use QOM [*] syntax for DR connectors., David Gibson, 2015/09/20