From 60eb8185fb03c3a46bb6a77b4540573518a53a7f Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Sun, 21 Feb 2010 15:00:47 +0200
Subject: [PATCH] --- yaml --- r: 197615 b: refs/heads/master c:
 112592da0dc2460c95e8a89d0c5657c6a30286aa h: refs/heads/master i:   197613:
 fa318a12c5d979625c45d8418ea2a02ca4c3fb3c   197611:
 8296f2a98b769375f874ad566e07ef61e5884b73   197607:
 3acbdb6a3884b77dfe75dd03c2f487ca42275d05   197599:
 9e7540df1da17a3e570c5707400c4b1ba72689fc v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff79313fe4ab..8278ef028e71 100644
--- 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
index 274a8e39bca7..1d27a57026ab 100644
--- 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);