diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-08-25 12:47:41 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-10-24 10:51:32 +0200 |
| commit | 6e2fb2cadd9a523ff5494d4c4d53c0d3e0024691 (patch) | |
| tree | 352e5e74cd0f1be588e5e5e515855cf4d8314c63 /arch | |
| parent | cc4feed57fcd4934b89aaac51d64dbff921e2f2b (diff) | |
| download | linux-stable-6e2fb2cadd9a523ff5494d4c4d53c0d3e0024691.tar.gz linux-stable-6e2fb2cadd9a523ff5494d4c4d53c0d3e0024691.tar.bz2 linux-stable-6e2fb2cadd9a523ff5494d4c4d53c0d3e0024691.zip | |
KVM: x86 emulator: Rename variable that shadows another local variable.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 1702ea8a28c6..42d42ca2c37b 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -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; } |