[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 13/16] pseries: Add pseries-2.6 machine type
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 13/16] pseries: Add pseries-2.6 machine type |
Date: |
Mon, 11 Jan 2016 15:37:35 +1100 |
Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>
---
hw/ppc/spapr.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 8b8eb18..7f6b118 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2337,18 +2337,36 @@ static const TypeInfo spapr_machine_info = {
machine_init(spapr_machine_register_##suffix)
/*
+ * pseries-2.6
+ */
+static void spapr_machine_2_6_instance_options(MachineState *machine)
+{
+}
+
+static void spapr_machine_2_6_class_options(MachineClass *mc)
+{
+ /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
+
+/*
* pseries-2.5
*/
+#define SPAPR_COMPAT_2_5 \
+ HW_COMPAT_2_5
+
static void spapr_machine_2_5_instance_options(MachineState *machine)
{
}
static void spapr_machine_2_5_class_options(MachineClass *mc)
{
- /* Defaults for the latest behaviour inherited from the base class */
+ spapr_machine_2_6_class_options(mc);
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5);
}
-DEFINE_SPAPR_MACHINE(2_5, "2.5", true);
+DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
/*
* pseries-2.4
--
2.5.0
- [Qemu-ppc] [PULL 00/16] ppc-for-2.6 queue 20160111, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 14/16] hw/ppc/spapr: Use XHCI as host controller for new spapr machines, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 16/16] hw/ppc/spapr: fix spapr->kvm_type leak, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 09/16] pseries: Use SET_MACHINE_COMPAT, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 12/16] pseries: Improve setting of default machine version, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 15/16] spapr vio: fix to incomplete QOMify, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 04/16] pseries: Remove redundant setting of mc->name for pseries-2.5 machine, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 13/16] pseries: Add pseries-2.6 machine type,
David Gibson <=
- [Qemu-ppc] [PULL 01/16] hw/ppc/spapr_rtc: Remove bad class_size value, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 02/16] target-ppc: Define kvmppc_read_int_dt(), David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 03/16] spapr: Add /system-id, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 07/16] pseries: Remove versions from mc->desc, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 08/16] Move SET_MACHINE_COMPAT macro to boards.h, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn(), David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 11/16] pseries: Restructure class_options functions, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 05/16] pseries: Rearrange versioned machine type code, David Gibson, 2016/01/10
- Re: [Qemu-ppc] [PULL 00/16] ppc-for-2.6 queue 20160111, Peter Maydell, 2016/01/11