From: Avi Kivity <avi@qumranet.com>
Date: Sun, 22 Jul 2007 12:51:58 +0000 (+0300)
Subject: KVM: x86 emulator: fix faulty check for two-byte opcode
X-Git-Tag: kvm-32~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=76f0301b5e4d2603d8e1ee5295db29faea660b49;p=users%2Fdwmw2%2Flinux.git

KVM: x86 emulator: fix faulty check for two-byte opcode

Right now, the bug is harmless as we never emulate one-byte 0xb6 or 0xb7.
But things may change.

Noted by the mysterious Gabriel C.

Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index ee16d694e046a..21ce977899371 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -819,7 +819,7 @@ done_prefixes:
 	case DstReg:
 		dst.type = OP_REG;
 		if ((d & ByteOp)
-		    && !(twobyte_table && (b == 0xb6 || b == 0xb7))) {
+		    && !(twobyte && (b == 0xb6 || b == 0xb7))) {
 			dst.ptr = decode_register(modrm_reg, _regs,
 						  (rex_prefix == 0));
 			dst.val = *(u8 *) dst.ptr;