diff options
| author | Greg Kurz <groug@kaod.org> | 2019-06-14 13:09:22 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2019-07-02 09:43:58 +1000 |
| commit | 001d235c7edaa135faf94e2dd590c069af9c430e (patch) | |
| tree | 054cc8a631cb03286d326a3df63a10e1edbcf3dc /target | |
| parent | 9723295a720ca26fe31a1e374555d83bccc051f4 (diff) | |
| download | qemu-001d235c7edaa135faf94e2dd590c069af9c430e.zip qemu-001d235c7edaa135faf94e2dd590c069af9c430e.tar.gz qemu-001d235c7edaa135faf94e2dd590c069af9c430e.tar.bz2 | |
target/ppc/machine: Add kvmppc_pvr_workaround_required() stub
This allows to drop the CONFIG_KVM guard from the code.
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <156051056289.224162.15553539098911498678.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'target')
| -rw-r--r-- | target/ppc/kvm_ppc.h | 5 | ||||
| -rw-r--r-- | 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 e642aaa..98bd7d5 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 5ad7b40..e82f5de 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]; |