]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
KVM: x86 emulator: Rename variable that shadows another local variable.
authorGleb Natapov <gleb@redhat.com>
Wed, 25 Aug 2010 09:47:41 +0000 (12:47 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 24 Oct 2010 08:51:32 +0000 (10:51 +0200)
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
arch/x86/kvm/emulate.c

index 1702ea8a28c61ba20bbeafbf234c1c7abe42ceb4..42d42ca2c37bea453f1bad9f32123354c126dcbb 100644 (file)
@@ -3421,7 +3421,7 @@ writeback:
                                &c->dst);
 
        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);
                /* The second termination condition only applies for REPE
                 * and REPNE. Test if the repeat string operation prefix is
@@ -3441,8 +3441,8 @@ writeback:
                 * Re-enter guest when pio read ahead buffer is empty or,
                 * if it is not used, after each 1024 iteration.
                 */
-               else if ((rc->end == 0 && !(c->regs[VCPU_REGS_RCX] & 0x3ff)) ||
-                        (rc->end != 0 && rc->end == rc->pos)) {
+               else if ((r->end == 0 && !(c->regs[VCPU_REGS_RCX] & 0x3ff)) ||
+                        (r->end != 0 && r->end == r->pos)) {
                        ctxt->restart = false;
                        c->eip = ctxt->eip;
                }