From 7ba52b5d9fbd65ff5a47d476816c0f9071718eeb Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Wed, 25 Aug 2010 12:47:41 +0300 Subject: [PATCH] --- yaml --- r: 215783 b: refs/heads/master c: 6e2fb2cadd9a523ff5494d4c4d53c0d3e0024691 h: refs/heads/master i: 215781: 5cf0c6e43aacff3f4c24f26cc79b9dce1ded3307 215779: 1bf9153da37d10a2d2b867b9a9eac8ff2f41c51e 215775: 4dadaa28c9f356f79cc0e33c9439f1004dff4050 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/emulate.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 27157ee71042..245147479d19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc4feed57fcd4934b89aaac51d64dbff921e2f2b +refs/heads/master: 6e2fb2cadd9a523ff5494d4c4d53c0d3e0024691 diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c index 1702ea8a28c6..42d42ca2c37b 100644 --- a/trunk/arch/x86/kvm/emulate.c +++ b/trunk/arch/x86/kvm/emulate.c @@ -3421,7 +3421,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) &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 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) * 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; }