Browse Source

KVM: x86: NOP emulation clears (incorrectly) the high 32-bits of RAX

On long-mode the current NOP (0x90) emulation still writes back to RAX.  As a
result, EAX is zero-extended and the high 32-bits of RAX are cleared.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Nadav Amit 11 years ago
parent
commit
a825f5cc4a
1 changed files with 3 additions and 2 deletions
  1. 3 2
      arch/x86/kvm/emulate.c

+ 3 - 2
arch/x86/kvm/emulate.c

@@ -4688,8 +4688,9 @@ special_insn:
 		break;
 		break;
 	case 0x90 ... 0x97: /* nop / xchg reg, rax */
 	case 0x90 ... 0x97: /* nop / xchg reg, rax */
 		if (ctxt->dst.addr.reg == reg_rmw(ctxt, VCPU_REGS_RAX))
 		if (ctxt->dst.addr.reg == reg_rmw(ctxt, VCPU_REGS_RAX))
-			break;
-		rc = em_xchg(ctxt);
+			ctxt->dst.type = OP_NONE;
+		else
+			rc = em_xchg(ctxt);
 		break;
 		break;
 	case 0x98: /* cbw/cwde/cdqe */
 	case 0x98: /* cbw/cwde/cdqe */
 		switch (ctxt->op_bytes) {
 		switch (ctxt->op_bytes) {