Commit 6e2fb2ca authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity

KVM: x86 emulator: Rename variable that shadows another local variable.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent cc4feed5
...@@ -3421,7 +3421,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -3421,7 +3421,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
&c->dst); &c->dst);
if (c->rep_prefix && (c->d & String)) { if (c->rep_prefix && (c->d & String)) {
struct read_cache *rc = &ctxt->decode.io_read; struct read_cache *r = &ctxt->decode.io_read;
register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1); register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1);
/* The second termination condition only applies for REPE /* The second termination condition only applies for REPE
* and REPNE. Test if the repeat string operation prefix is * and REPNE. Test if the repeat string operation prefix is
...@@ -3441,8 +3441,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -3441,8 +3441,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
* Re-enter guest when pio read ahead buffer is empty or, * Re-enter guest when pio read ahead buffer is empty or,
* if it is not used, after each 1024 iteration. * if it is not used, after each 1024 iteration.
*/ */
else if ((rc->end == 0 && !(c->regs[VCPU_REGS_RCX] & 0x3ff)) || else if ((r->end == 0 && !(c->regs[VCPU_REGS_RCX] & 0x3ff)) ||
(rc->end != 0 && rc->end == rc->pos)) { (r->end != 0 && r->end == r->pos)) {
ctxt->restart = false; ctxt->restart = false;
c->eip = ctxt->eip; c->eip = ctxt->eip;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment