瀏覽代碼

KVM: x86 emulator: Fix nop emulation

If a nop instruction is encountered, we jump directly to the done label.
This skip updating rip. Break from the switch case instead

Signed-off-by: Mohammed Gamal <m.gamal005@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Mohammed Gamal 15 年之前
父節點
當前提交
34698d8c61
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/x86/kvm/emulate.c

+ 1 - 1
arch/x86/kvm/emulate.c

@@ -2912,7 +2912,7 @@ special_insn:
 		break;
 		break;
 	case 0x90 ... 0x97: /* nop / xchg reg, rax */
 	case 0x90 ... 0x97: /* nop / xchg reg, rax */
 		if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX])
 		if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX])
-			goto done;
+			break;
 		goto xchg;
 		goto xchg;
 	case 0x9c: /* pushf */
 	case 0x9c: /* pushf */
 		c->src.val =  (unsigned long) ctxt->eflags;
 		c->src.val =  (unsigned long) ctxt->eflags;