The patch titled
KVM: Fix emulator mov cr decoding
has been added to the -mm tree. Its filename is
kvm-x86-emulator-fix-emulator-mov-cr-decoding.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: KVM: Fix emulator mov cr decoding
From: Yaniv Kamay <yaniv@xxxxxxxxxxxx>
Decoding of the mov cr instructions was wrong.
Signed-off-by: Yaniv Kamay <yaniv@xxxxxxxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/kvm/x86_emulate.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/kvm/x86_emulate.c~kvm-x86-emulator-fix-emulator-mov-cr-decoding drivers/kvm/x86_emulate.c
--- a/drivers/kvm/x86_emulate.c~kvm-x86-emulator-fix-emulator-mov-cr-decoding
+++ a/drivers/kvm/x86_emulate.c
@@ -1265,13 +1265,13 @@ twobyte_special_insn:
b = insn_fetch(u8, 1, _eip);
if ((b & 0xc0) != 0xc0)
goto cannot_emulate;
- _regs[(b >> 3) & 7] = realmode_get_cr(ctxt->vcpu, b & 7);
+ _regs[b & 7] = realmode_get_cr(ctxt->vcpu, (b >> 3) & 7);
break;
case 0x22: /* mov reg, cr */
b = insn_fetch(u8, 1, _eip);
if ((b & 0xc0) != 0xc0)
goto cannot_emulate;
- realmode_set_cr(ctxt->vcpu, b & 7, _regs[(b >> 3) & 7] & -1u,
+ realmode_set_cr(ctxt->vcpu, (b >> 3) & 7, _regs[b & 7] & -1u,
&_eflags);
break;
case 0xc7: /* Grp9 (cmpxchg8b) */
_
Patches currently in -mm which might be from yaniv@xxxxxxxxxxxx are
kvm-userspace-interface.patch
kvm-intel-virtual-mode-extensions-definitions.patch
kvm-kvm-data-structures.patch
kvm-random-accessors-and-constants.patch
kvm-virtualization-infrastructure.patch
kvm-virtualization-infrastructure-fix-segment-state-changes-across-processor-mode-switches.patch
kvm-virtualization-infrastructure-fix-mmu-reset-locking-when-setting-cr0.patch
kvm-memory-slot-management.patch
kvm-vcpu-creation-and-maintenance.patch
kvm-vcpu-execution-loop.patch
kvm-define-exit-handlers.patch
kvm-define-exit-handlers-pass-fs-gs-segment-bases-to-x86-emulator.patch
kvm-less-common-exit-handlers.patch
kvm-less-common-exit-handlers-handle-rdmsrmsr_efer.patch
kvm-mmu.patch
kvm-x86-emulator.patch
kvm-x86-emulator-fix-emulator-mov-cr-decoding.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
