diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2014-05-23 12:26:58 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-06-16 13:24:38 +0200 |
| commit | 6db5bb0f547b0a0889e8c2ee330f789916813e94 (patch) | |
| tree | b613f4bbad7641fc7fc7f25d5f7e83c99a2612cd | |
| parent | 3794d5482d74dc0031cee6d5be2c61c88ca723bd (diff) | |
KVM: PPC: Enable compatibility mode
The host kernel implements a KVM_REG_PPC_ARCH_COMPAT register which
this uses to enable a compatibility mode if any chosen.
This sets the KVM_REG_PPC_ARCH_COMPAT register in KVM. ppc_set_compat()
signals the caller if the mode cannot be enabled by the host kernel.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
[agraf: fix TCG compat setting]
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | target-ppc/kvm.c | 5 | ||||
| -rw-r--r-- | target-ppc/kvm_ppc.h | 6 | ||||
| -rw-r--r-- | target-ppc/translate_init.c | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index ca31027df7..05952d09e7 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -1514,6 +1514,11 @@ void kvmppc_set_papr(PowerPCCPU *cpu) cap_papr = 1; } +int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version) +{ + return kvm_set_one_reg(CPU(cpu), KVM_REG_PPC_ARCH_COMPAT, &cpu_version); +} + void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy) { CPUState *cs = CPU(cpu); diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index ff077ec502..716c33dfee 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -23,6 +23,7 @@ int kvmppc_get_hasidle(CPUPPCState *env); int kvmppc_get_hypercall(CPUPPCState *env, uint8_t *buf, int buf_len); int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level); void kvmppc_set_papr(PowerPCCPU *cpu); +int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version); void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy); int kvmppc_smt_threads(void); int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); @@ -95,6 +96,11 @@ static inline void kvmppc_set_papr(PowerPCCPU *cpu) { } +static inline int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version) +{ + return 0; +} + static inline void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy) { } diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 56d3b97368..c13cbba16c 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8970,6 +8970,11 @@ int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version) break; } + if (kvm_enabled() && kvmppc_set_compat(cpu, cpu->max_compat) < 0) { + error_report("Unable to set compatibility mode in KVM"); + ret = -1; + } + return ret; } |