|
 |
77609c |
From 81c5a3cec15194bf75366813274f63d596f04807 Mon Sep 17 00:00:00 2001
|
|
|
77609c |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
77609c |
Date: Mon, 15 Nov 2021 05:46:15 -0500
|
|
|
77609c |
Subject: [PATCH 6/6] Fix for ppc64le build
|
|
|
77609c |
|
|
|
77609c |
Although we do not support ppc64 build, there can be some custom builds running
|
|
|
77609c |
it. Fix code so the ppc64le build is buildable.
|
|
|
77609c |
|
|
|
77609c |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
77609c |
---
|
|
|
77609c |
hw/ppc/spapr.c | 7 +++++--
|
|
|
77609c |
target/ppc/kvm.c | 5 ++---
|
|
|
77609c |
2 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
77609c |
|
|
|
77609c |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
77609c |
index 1386e45e70..8699cc3d0c 100644
|
|
|
77609c |
--- a/hw/ppc/spapr.c
|
|
|
77609c |
+++ b/hw/ppc/spapr.c
|
|
|
77609c |
@@ -4991,7 +4991,6 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
|
|
|
77609c |
/*
|
|
|
77609c |
* pseries-2.7
|
|
|
77609c |
*/
|
|
|
77609c |
-#endif
|
|
|
77609c |
|
|
|
77609c |
static bool phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
|
|
|
77609c |
uint64_t *buid, hwaddr *pio,
|
|
|
77609c |
@@ -5047,7 +5046,6 @@ static bool phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
|
|
|
77609c |
return true;
|
|
|
77609c |
}
|
|
|
77609c |
|
|
|
77609c |
-#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
77609c |
static void spapr_machine_2_7_class_options(MachineClass *mc)
|
|
|
77609c |
{
|
|
|
77609c |
SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
|
|
77609c |
@@ -5372,4 +5370,9 @@ static void spapr_machine_rhel760sxxm_class_options(MachineClass *mc)
|
|
|
77609c |
|
|
|
77609c |
DEFINE_SPAPR_MACHINE(rhel760sxxm, "rhel7.6.0-sxxm", false);
|
|
|
77609c |
|
|
|
77609c |
+static void spapr_machine_register_types(void)
|
|
|
77609c |
+{
|
|
|
77609c |
+ type_register_static(&spapr_machine_info);
|
|
|
77609c |
+}
|
|
|
77609c |
+
|
|
|
77609c |
type_init(spapr_machine_register_types)
|
|
|
77609c |
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
|
|
|
77609c |
index 0f4f072fbd..154888cce5 100644
|
|
|
77609c |
--- a/target/ppc/kvm.c
|
|
|
77609c |
+++ b/target/ppc/kvm.c
|
|
|
77609c |
@@ -2560,11 +2560,11 @@ int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable)
|
|
|
77609c |
return 0;
|
|
|
77609c |
}
|
|
|
77609c |
|
|
|
77609c |
-<<<<<<< HEAD
|
|
|
77609c |
int kvmppc_has_cap_rpt_invalidate(void)
|
|
|
77609c |
{
|
|
|
77609c |
return cap_rpt_invalidate;
|
|
|
77609c |
-=======
|
|
|
77609c |
+}
|
|
|
77609c |
+
|
|
|
77609c |
bool kvmppc_has_cap_secure_guest(void)
|
|
|
77609c |
{
|
|
|
77609c |
return !!cap_ppc_secure_guest;
|
|
|
77609c |
@@ -2573,7 +2573,6 @@ bool kvmppc_has_cap_secure_guest(void)
|
|
|
77609c |
int kvmppc_enable_cap_secure_guest(void)
|
|
|
77609c |
{
|
|
|
77609c |
return kvm_vm_enable_cap(kvm_state, KVM_CAP_PPC_SECURE_GUEST, 0, 1);
|
|
|
77609c |
->>>>>>> 89c02f0e37... Add ppc64 machine types
|
|
|
77609c |
}
|
|
|
77609c |
|
|
|
77609c |
PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void)
|
|
|
77609c |
--
|
|
|
77609c |
2.27.0
|
|
|
77609c |
|