---

yaml --- r: 197615 b: refs/heads/master c: 112592d h: refs/heads/master i: 197613: fa318a1 197611: 8296f2a 197607: 3acbdb6 197599: 9e7540d v: v3
git-mirror · Apr 25, 2010 · 60eb818 · 60eb818
1 parent 6f61f86
commit 60eb818
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 032c3407310c7612db55ab7e1335a21dc2b4690d
+refs/heads/master: 112592da0dc2460c95e8a89d0c5657c6a30286aa
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -3443,7 +3443,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 	if (vcpu->arch.pio.string)
 		return EMULATE_DO_MMIO;
 
-	if ((r || vcpu->mmio_is_write) && run) {
+	if (r || vcpu->mmio_is_write) {
 		run->exit_reason = KVM_EXIT_MMIO;
 		run->mmio.phys_addr = vcpu->mmio_phys_addr;
 		memcpy(run->mmio.data, vcpu->mmio_data, 8);