From c50809efaa211a62b8c580a8927ef3ad0d5a745f Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Tue, 12 Apr 2011 12:36:24 +0300 Subject: [PATCH] --- yaml --- r: 248085 b: refs/heads/master c: 0004c7c25757f103ddb3a9e4bcfd533aad41f9a0 h: refs/heads/master i: 248083: 9524c0dc480a650b2863c43a42bcb639da7375ca v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 647820a370bb..562c25560ee2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4947e7cd0ee36e1aa37dfec4f7fa71cc64a2f0fd +refs/heads/master: 0004c7c25757f103ddb3a9e4bcfd533aad41f9a0 diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index e3ac212f7c87..a9a307a75465 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/arch/x86/kvm/x86.c @@ -5576,7 +5576,8 @@ static int complete_mmio(struct kvm_vcpu *vcpu) if (vcpu->mmio_needed) { vcpu->mmio_needed = 0; if (!vcpu->mmio_is_write) - memcpy(vcpu->mmio_data, run->mmio.data, 8); + memcpy(vcpu->mmio_data + vcpu->mmio_index, + run->mmio.data, 8); vcpu->mmio_index += 8; if (vcpu->mmio_index < vcpu->mmio_size) { run->exit_reason = KVM_EXIT_MMIO;