Message ID | 20090405135928.3014.39408.stgit@trex.usersys.redhat.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Gleb Natapov wrote: > Signed-off-by: Gleb Natapov <gleb@redhat.com> > --- > > arch/x86/kvm/x86_emulate.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c > index 3c23af0..cf27e62 100644 > --- a/arch/x86/kvm/x86_emulate.c > +++ b/arch/x86/kvm/x86_emulate.c > @@ -193,8 +193,10 @@ static u32 opcode_table[256] = { > 0, 0, 0, 0, 0, 0, 0, 0, > /* 0xE0 - 0xE7 */ > 0, 0, 0, 0, > - SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, > - SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, > + SrcNone | ByteOp | SrcImmByte | ImplicitOps, > + SrcNone | SrcImmByte | ImplicitOps, > + SrcNone | ByteOp | SrcImmByte | ImplicitOps, > + SrcNone | SrcImmByte | ImplicitOps, > SrcImmByte sign extends, but you want zero extension here.
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index 3c23af0..cf27e62 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c @@ -193,8 +193,10 @@ static u32 opcode_table[256] = { 0, 0, 0, 0, 0, 0, 0, 0, /* 0xE0 - 0xE7 */ 0, 0, 0, 0, - SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, - SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, + SrcNone | ByteOp | SrcImmByte | ImplicitOps, + SrcNone | SrcImmByte | ImplicitOps, + SrcNone | ByteOp | SrcImmByte | ImplicitOps, + SrcNone | SrcImmByte | ImplicitOps, /* 0xE8 - 0xEF */ SrcImm | ImplicitOps | Stack, SrcImm | ImplicitOps, SrcImm | Src2Imm16 | ImplicitOps, SrcImmByte | ImplicitOps, @@ -1780,12 +1782,12 @@ special_insn: break; case 0xe4: /* inb */ case 0xe5: /* in */ - port = insn_fetch(u8, 1, c->eip); + port = c->src.val; io_dir_in = 1; goto do_io; case 0xe6: /* outb */ case 0xe7: /* out */ - port = insn_fetch(u8, 1, c->eip); + port = c->src.val; io_dir_in = 0; goto do_io; case 0xe8: /* call (near) */ {
Signed-off-by: Gleb Natapov <gleb@redhat.com> --- arch/x86/kvm/x86_emulate.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html