---

yaml --- r: 248085 b: refs/heads/master c: 0004c7c h: refs/heads/master i: 248083: 9524c0d v: v3
git-mirror · May 22, 2011 · c50809e · c50809e
1 parent 296a60d
commit c50809e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;