|
 |
9bac43 |
From d8bf28e9ec1a5d854c3fa6f17001db2e8bc59a7a Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Date: Mon, 9 Oct 2017 14:23:18 +0200
|
|
|
9bac43 |
Subject: [PATCH 08/69] qemu-kvm-ma: define only pseries-rhel7.5.0 machine type
|
|
|
9bac43 |
for -ma
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Message-id: <20171009142318.6262-5-lvivier@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77032
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 4/4] qemu-kvm-ma: define only pseries-rhel7.5.0 machine type for -ma
|
|
|
9bac43 |
Bugzilla: 1478478
|
|
|
9bac43 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
qemu-kvm-ma doesn't support pseries-rhel7.2.0,
|
|
|
9bac43 |
pseries-rhel7.3.0, pseries-rhel7.4.0 whereas
|
|
|
9bac43 |
qemu-kvm-rhev does. And as the sources are shared
|
|
|
9bac43 |
we use a configuration switch to disable this part
|
|
|
9bac43 |
of the code.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
hw/ppc/spapr.c | 5 +++++
|
|
|
9bac43 |
1 file changed, 5 insertions(+)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
9bac43 |
index cb317f8..3c598fd 100644
|
|
|
9bac43 |
--- a/hw/ppc/spapr.c
|
|
|
9bac43 |
+++ b/hw/ppc/spapr.c
|
|
|
9bac43 |
@@ -3734,6 +3734,7 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
|
|
|
9bac43 |
},
|
|
|
9bac43 |
#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if defined(CONFIG_RHV)
|
|
|
9bac43 |
static void phb_placement_2_7(sPAPRMachineState *spapr, uint32_t index,
|
|
|
9bac43 |
uint64_t *buid, hwaddr *pio,
|
|
|
9bac43 |
hwaddr *mmio32, hwaddr *mmio64,
|
|
|
9bac43 |
@@ -3782,6 +3783,7 @@ static void phb_placement_2_7(sPAPRMachineState *spapr, uint32_t index,
|
|
|
9bac43 |
* window into contiguous 32-bit and 64-bit windows
|
|
|
9bac43 |
*/
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif /* CONFIG_RHV */
|
|
|
9bac43 |
|
|
|
9bac43 |
#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
static void spapr_machine_2_7_instance_options(MachineState *machine)
|
|
|
9bac43 |
@@ -3960,6 +3962,8 @@ static void spapr_machine_rhel750_class_options(MachineClass *mc)
|
|
|
9bac43 |
|
|
|
9bac43 |
DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", true);
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if defined(CONFIG_RHV)
|
|
|
9bac43 |
+
|
|
|
9bac43 |
/*
|
|
|
9bac43 |
* pseries-rhel7.4.0
|
|
|
9bac43 |
* like SPAPR_COMPAT_2_9
|
|
|
9bac43 |
@@ -4079,6 +4083,7 @@ static void spapr_machine_rhel720_class_options(MachineClass *mc)
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
DEFINE_SPAPR_MACHINE(rhel720, "rhel7.2.0", false);
|
|
|
9bac43 |
+#endif /* CONFIG_RHV */
|
|
|
9bac43 |
|
|
|
9bac43 |
static void spapr_machine_register_types(void)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|