diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-10-26 14:16:56 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-11-08 10:42:04 +0200 |
| commit | 1e35d3c4a7a9682256c887a1388cf3faefdf53df (patch) | |
| tree | 999da37bbcd4cc782ffc73a5f80268e915204e48 | |
| parent | dbeeb816e805091e7cfc03baf36dc40b4adb2bbd (diff) | |
| download | linux-stable-1e35d3c4a7a9682256c887a1388cf3faefdf53df.tar.gz linux-stable-1e35d3c4a7a9682256c887a1388cf3faefdf53df.tar.bz2 linux-stable-1e35d3c4a7a9682256c887a1388cf3faefdf53df.zip | |
KVM: x86 emulator: fix 'push imm8' emulation
'push imm8' found itself in the wrong switch somehow, so it is never executed.
This fixes Windows 2003 installation.
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/x86_emulate.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c index a6ace302e0cd..da0cdd521da9 100644 --- a/drivers/kvm/x86_emulate.c +++ b/drivers/kvm/x86_emulate.c @@ -980,17 +980,6 @@ done_prefixes: goto cannot_emulate; dst.val = (s32) src.val; break; - case 0x6a: /* push imm8 */ - src.val = 0L; - src.val = insn_fetch(s8, 1, _eip); -push: - dst.type = OP_MEM; - dst.bytes = op_bytes; - dst.val = src.val; - register_address_increment(_regs[VCPU_REGS_RSP], -op_bytes); - dst.ptr = (void *) register_address(ctxt->ss_base, - _regs[VCPU_REGS_RSP]); - break; case 0x80 ... 0x83: /* Grp1 */ switch (modrm_reg) { case 0: @@ -1243,6 +1232,17 @@ special_insn: register_address_increment(_regs[VCPU_REGS_RSP], op_bytes); no_wb = 1; /* Disable writeback. */ break; + case 0x6a: /* push imm8 */ + src.val = 0L; + src.val = insn_fetch(s8, 1, _eip); + push: + dst.type = OP_MEM; + dst.bytes = op_bytes; + dst.val = src.val; + register_address_increment(_regs[VCPU_REGS_RSP], -op_bytes); + dst.ptr = (void *) register_address(ctxt->ss_base, + _regs[VCPU_REGS_RSP]); + break; case 0x6c: /* insb */ case 0x6d: /* insw/insd */ if (kvm_emulate_pio_string(ctxt->vcpu, NULL, |