falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexey Kardashevskiy 2014-05-23 12:26:58 +10:00 committed by Alexander Graf
parent 3794d5482d
commit 6db5bb0f54
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target-ppc/kvm.c
View File

@ -1514,6 +1514,11 @@ void kvmppc_set_papr(PowerPCCPU *cpu)
cap_papr = 1; 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) void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy)
{ {
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);

6
target-ppc/kvm_ppc.h
View File

@ -23,6 +23,7 @@ int kvmppc_get_hasidle(CPUPPCState *env);
int kvmppc_get_hypercall(CPUPPCState *env, uint8_t *buf, int buf_len); int kvmppc_get_hypercall(CPUPPCState *env, uint8_t *buf, int buf_len);
int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level); int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level);
void kvmppc_set_papr(PowerPCCPU *cpu); 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); void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
int kvmppc_smt_threads(void); int kvmppc_smt_threads(void);
int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); 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) static inline void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy)
{ {
} }

5
target-ppc/translate_init.c
View File

@ -8970,6 +8970,11 @@ int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version)
break; 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; return ret;
} }