diff options
author | Gleb Natapov <gleb@redhat.com> | 2010-08-25 05:47:41 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-24 04:51:32 -0400 |
commit | 6e2fb2cadd9a523ff5494d4c4d53c0d3e0024691 (patch) | |
tree | 352e5e74cd0f1be588e5e5e515855cf4d8314c63 /arch/x86/kvm/emulate.c | |
parent | cc4feed57fcd4934b89aaac51d64dbff921e2f2b (diff) |
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/x86/kvm/emulate.c')
-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: | |||
3421 | &c->dst); | 3421 | &c->dst); |
3422 | 3422 | ||
3423 | if (c->rep_prefix && (c->d & String)) { | 3423 | if (c->rep_prefix && (c->d & String)) { |
3424 | struct read_cache *rc = &ctxt->decode.io_read; | 3424 | struct read_cache *r = &ctxt->decode.io_read; |
3425 | register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1); | 3425 | register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1); |
3426 | /* The second termination condition only applies for REPE | 3426 | /* The second termination condition only applies for REPE |
3427 | * and REPNE. Test if the repeat string operation prefix is | 3427 | * and REPNE. Test if the repeat string operation prefix is |
@@ -3441,8 +3441,8 @@ writeback: | |||
3441 | * Re-enter guest when pio read ahead buffer is empty or, | 3441 | * Re-enter guest when pio read ahead buffer is empty or, |
3442 | * if it is not used, after each 1024 iteration. | 3442 | * if it is not used, after each 1024 iteration. |
3443 | */ | 3443 | */ |
3444 | else if ((rc->end == 0 && !(c->regs[VCPU_REGS_RCX] & 0x3ff)) || | 3444 | else if ((r->end == 0 && !(c->regs[VCPU_REGS_RCX] & 0x3ff)) || |
3445 | (rc->end != 0 && rc->end == rc->pos)) { | 3445 | (r->end != 0 && r->end == r->pos)) { |
3446 | ctxt->restart = false; | 3446 | ctxt->restart = false; |
3447 | c->eip = ctxt->eip; | 3447 | c->eip = ctxt->eip; |
3448 | } | 3448 | } |