diff --git a/[refs] b/[refs] index ebbd38e59eeb..cfb7e6867ae9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 098c937ba30acc5b7dcb6a4ad7cc8d63c7117546 +refs/heads/master: c53ce170a9e8531f293e402c7d8c65e38452a551 diff --git a/trunk/drivers/kvm/x86_emulate.c b/trunk/drivers/kvm/x86_emulate.c index fa7aa278956f..1036e0224aaa 100644 --- a/trunk/drivers/kvm/x86_emulate.c +++ b/trunk/drivers/kvm/x86_emulate.c @@ -148,7 +148,7 @@ static u8 opcode_table[256] = { /* 0xE0 - 0xE7 */ 0, 0, 0, 0, 0, 0, 0, 0, /* 0xE8 - 0xEF */ - 0, SrcImm|ImplicitOps, 0, 0, 0, 0, 0, 0, + 0, SrcImm|ImplicitOps, 0, SrcImmByte|ImplicitOps, 0, 0, 0, 0, /* 0xF0 - 0xF7 */ 0, 0, 0, 0, ImplicitOps, 0, @@ -1032,6 +1032,7 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) src.val = _regs[VCPU_REGS_RCX]; goto grp2; case 0xe9: /* jmp rel */ + case 0xeb: /* jmp rel short */ JMP_REL(src.val); no_wb = 1; /* Disable writeback. */ break;