On 12/06/2016 20:45, Paolo Bonzini wrote: > > > On 09/06/2016 11:50, James Hogan wrote: >> These patches fix a couple of issues I recently spotted when running KVM >> under QEMU (i.e. the host MIPS kernel is running under QEMU on a PC). >> >> Patches 1-2: Fix modular KVM broken by QEMU TLB optimisation (Patch 1 >> marked for stable). >> >> Patches 3-4: Fix cache instruction emulation, exposed by having dynamic >> translation of emulated instructions accidentally turned off. >> >> James Hogan (4): >> MIPS: KVM: Fix modular KVM under QEMU >> MIPS: KVM: Include bit 31 in segment matches >> MIPS: KVM: Don't unwind PC when emulating CACHE >> MIPS: KVM: Fix CACHE triggered exception emulation >> >> arch/mips/include/asm/kvm_host.h | 3 ++- >> arch/mips/kvm/emulate.c | 21 ++++++++++++++------- >> arch/mips/kvm/interrupt.h | 1 + >> arch/mips/kvm/locore.S | 1 + >> arch/mips/kvm/mips.c | 11 ++++++++++- >> 5 files changed, 28 insertions(+), 9 deletions(-) >> >> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> >> Cc: Radim Krčmář <rkrcmar@xxxxxxxxxx> >> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> >> Cc: kvm@xxxxxxxxxxxxxxx >> Cc: linux-mips@xxxxxxxxxxxxxx >> Cc: stable@xxxxxxxxxxxxxxx >> > > Queued for kvm/master. ... and kvm/next too, since your patches conflict with this one. Paolo