[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 7/7] target/ppc/machine: Add kvmppc_pvr_workaround_req
From: |
Greg Kurz |
Subject: |
[Qemu-ppc] [PATCH 7/7] target/ppc/machine: Add kvmppc_pvr_workaround_required() stub |
Date: |
Fri, 14 Jun 2019 13:09:22 +0200 |
User-agent: |
StGit/unknown-version |
This allows to drop the CONFIG_KVM guard from the code.
Signed-off-by: Greg Kurz <address@hidden>
---
target/ppc/kvm_ppc.h | 5 +++++
target/ppc/machine.c | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index e642aaaf9226..98bd7d5da6d6 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -399,6 +399,11 @@ static inline int kvmppc_resize_hpt_commit(PowerPCCPU *cpu,
return -ENOSYS;
}
+static inline bool kvmppc_pvr_workaround_required(PowerPCCPU *cpu)
+{
+ return false;
+}
+
#endif
#ifndef CONFIG_KVM
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index 5ad7b40f4533..e82f5de9db7c 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -378,11 +378,9 @@ static int cpu_post_load(void *opaque, int version_id)
* receive the PVR it expects as a workaround.
*
*/
-#if defined(CONFIG_KVM)
if (kvmppc_pvr_workaround_required(cpu)) {
env->spr[SPR_PVR] = env->spr_cb[SPR_PVR].default_value;
}
-#endif
env->lr = env->spr[SPR_LR];
env->ctr = env->spr[SPR_CTR];
- [Qemu-ppc] [PATCH 0/7] ppc: Get rid of some CONFIG_KVM guards, Greg Kurz, 2019/06/14
- [Qemu-ppc] [PATCH 7/7] target/ppc/machine: Add kvmppc_pvr_workaround_required() stub,
Greg Kurz <=
- [Qemu-ppc] [PATCH 6/7] ppc: Introduce kvmppc_set_reg_tb_offset() helper, Greg Kurz, 2019/06/14
- [Qemu-ppc] [PATCH 5/7] hw/ppc: Drop useless CONFIG_KVM ifdefery, Greg Kurz, 2019/06/14
- [Qemu-ppc] [PATCH 3/7] hw/ppc/mac_newworld: Drop useless CONFIG_KVM ifdefery, Greg Kurz, 2019/06/14
- [Qemu-ppc] [PATCH 1/7] spapr_pci: Drop useless CONFIG_KVM ifdefery, Greg Kurz, 2019/06/14
- [Qemu-ppc] [PATCH 2/7] hw/ppc/mac_oldworld: Drop useless CONFIG_KVM ifdefery, Greg Kurz, 2019/06/14
- [Qemu-ppc] [PATCH 4/7] hw/ppc/prep: Drop useless CONFIG_KVM ifdefery, Greg Kurz, 2019/06/14
- Re: [Qemu-ppc] [PATCH 0/7] ppc: Get rid of some CONFIG_KVM guards, David Gibson, 2019/06/19