diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kvm/emulate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 59992484f5f3..3d0e5ac3a0c1 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
@@ -500,7 +500,6 @@ static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, | |||
500 | } | 500 | } |
501 | 501 | ||
502 | static unsigned seg_override(struct x86_emulate_ctxt *ctxt, | 502 | static unsigned seg_override(struct x86_emulate_ctxt *ctxt, |
503 | struct x86_emulate_ops *ops, | ||
504 | struct decode_cache *c) | 503 | struct decode_cache *c) |
505 | { | 504 | { |
506 | if (!c->has_seg_override) | 505 | if (!c->has_seg_override) |
@@ -3527,7 +3526,7 @@ done_prefixes: | |||
3527 | if (!c->has_seg_override) | 3526 | if (!c->has_seg_override) |
3528 | set_seg_override(c, VCPU_SREG_DS); | 3527 | set_seg_override(c, VCPU_SREG_DS); |
3529 | 3528 | ||
3530 | memop.addr.mem.seg = seg_override(ctxt, ops, c); | 3529 | memop.addr.mem.seg = seg_override(ctxt, c); |
3531 | 3530 | ||
3532 | if (memop.type == OP_MEM && c->ad_bytes != 8) | 3531 | if (memop.type == OP_MEM && c->ad_bytes != 8) |
3533 | memop.addr.mem.ea = (u32)memop.addr.mem.ea; | 3532 | memop.addr.mem.ea = (u32)memop.addr.mem.ea; |
@@ -3587,7 +3586,7 @@ done_prefixes: | |||
3587 | c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes; | 3586 | c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes; |
3588 | c->src.addr.mem.ea = | 3587 | c->src.addr.mem.ea = |
3589 | register_address(c, c->regs[VCPU_REGS_RSI]); | 3588 | register_address(c, c->regs[VCPU_REGS_RSI]); |
3590 | c->src.addr.mem.seg = seg_override(ctxt, ops, c), | 3589 | c->src.addr.mem.seg = seg_override(ctxt, c); |
3591 | c->src.val = 0; | 3590 | c->src.val = 0; |
3592 | break; | 3591 | break; |
3593 | case SrcImmFAddr: | 3592 | case SrcImmFAddr: |
@@ -4103,7 +4102,7 @@ writeback: | |||
4103 | c->dst.type = saved_dst_type; | 4102 | c->dst.type = saved_dst_type; |
4104 | 4103 | ||
4105 | if ((c->d & SrcMask) == SrcSI) | 4104 | if ((c->d & SrcMask) == SrcSI) |
4106 | string_addr_inc(ctxt, seg_override(ctxt, ops, c), | 4105 | string_addr_inc(ctxt, seg_override(ctxt, c), |
4107 | VCPU_REGS_RSI, &c->src); | 4106 | VCPU_REGS_RSI, &c->src); |
4108 | 4107 | ||
4109 | if ((c->d & DstMask) == DstDI) | 4108 | if ((c->d & DstMask) == DstDI) |