|
 |
8be556 |
From a465463f907c8344c855b0a2084e36b20f234048 Mon Sep 17 00:00:00 2001
|
|
|
8be556 |
From: Laurent Vivier <lvivier@redhat.com>
|
|
|
8be556 |
Date: Tue, 9 Jun 2015 08:35:41 +0200
|
|
|
8be556 |
Subject: [PATCH 008/217] Downstream-only: Add rhel7.2.0 machine type
|
|
|
8be556 |
|
|
|
8be556 |
Message-id: <1433838941-28412-1-git-send-email-lvivier@redhat.com>
|
|
|
8be556 |
Patchwork-id: 65562
|
|
|
8be556 |
O-Subject: [RHEL-7.2 qemu-kvm-rhev PATCH v3] Downstream-only: Add rhel7.2.0 machine type
|
|
|
8be556 |
Bugzilla: 1228574
|
|
|
8be556 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
8be556 |
|
|
|
8be556 |
Replace RHEL 7.1 machine type by RHEL 7.2 machine type.
|
|
|
8be556 |
pseries-rhel7.2.0 is now the default machine type for PPC64.
|
|
|
8be556 |
|
|
|
8be556 |
/usr/libexec/qemu-kvm -M ?
|
|
|
8be556 |
Supported machines are:
|
|
|
8be556 |
none empty machine
|
|
|
8be556 |
pseries RHEL 7.2.0 pSeries Logical Partition (PAPR compliant) (alias of pseries-rhel7.2.0)
|
|
|
8be556 |
pseries-rhel7.2.0 RHEL 7.2.0 pSeries Logical Partition (PAPR compliant) (default)
|
|
|
8be556 |
|
|
|
8be556 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
8be556 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
---
|
|
|
8be556 |
hw/ppc/spapr.c | 15 +++++++--------
|
|
|
8be556 |
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
|
8be556 |
|
|
|
8be556 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
8be556 |
index d1f7725..3fe98ff 100644
|
|
|
8be556 |
--- a/hw/ppc/spapr.c
|
|
|
8be556 |
+++ b/hw/ppc/spapr.c
|
|
|
8be556 |
@@ -1881,21 +1881,20 @@ static const TypeInfo spapr_machine_2_3_info = {
|
|
|
8be556 |
.class_init = spapr_machine_2_3_class_init,
|
|
|
8be556 |
};
|
|
|
8be556 |
#endif
|
|
|
8be556 |
-static void spapr_machine_rhel710_class_init(ObjectClass *oc, void *data)
|
|
|
8be556 |
+static void spapr_machine_rhel720_class_init(ObjectClass *oc, void *data)
|
|
|
8be556 |
{
|
|
|
8be556 |
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
8be556 |
|
|
|
8be556 |
- mc->name = "pseries-rhel7.1.0";
|
|
|
8be556 |
- mc->desc = "RHEL 7.1.0 pSeries Logical Partition (PAPR compliant)";
|
|
|
8be556 |
+ mc->name = "pseries-rhel7.2.0";
|
|
|
8be556 |
+ mc->desc = "RHEL 7.2.0 pSeries Logical Partition (PAPR compliant)";
|
|
|
8be556 |
mc->alias = "pseries";
|
|
|
8be556 |
mc->is_default = 1;
|
|
|
8be556 |
}
|
|
|
8be556 |
|
|
|
8be556 |
-
|
|
|
8be556 |
-static const TypeInfo spapr_machine_rhel710_info = {
|
|
|
8be556 |
- .name = TYPE_SPAPR_MACHINE "RHEL7.1.0",
|
|
|
8be556 |
+static const TypeInfo spapr_machine_rhel720_info = {
|
|
|
8be556 |
+ .name = TYPE_SPAPR_MACHINE "RHEL7.2.0",
|
|
|
8be556 |
.parent = TYPE_SPAPR_MACHINE,
|
|
|
8be556 |
- .class_init = spapr_machine_rhel710_class_init,
|
|
|
8be556 |
+ .class_init = spapr_machine_rhel720_class_init,
|
|
|
8be556 |
};
|
|
|
8be556 |
|
|
|
8be556 |
static void spapr_machine_register_types(void)
|
|
|
8be556 |
@@ -1906,7 +1905,7 @@ static void spapr_machine_register_types(void)
|
|
|
8be556 |
type_register_static(&spapr_machine_2_2_info);
|
|
|
8be556 |
type_register_static(&spapr_machine_2_3_info);
|
|
|
8be556 |
*/
|
|
|
8be556 |
- type_register_static(&spapr_machine_rhel710_info);
|
|
|
8be556 |
+ type_register_static(&spapr_machine_rhel720_info);
|
|
|
8be556 |
}
|
|
|
8be556 |
|
|
|
8be556 |
type_init(spapr_machine_register_types)
|
|
|
8be556 |
--
|
|
|
8be556 |
1.8.3.1
|
|
|
8be556 |
|