From fc9b9738055c1749ecc90c13c75e0b2895aa7b0c Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Tue, 17 Jul 2007 12:26:59 -0400
Subject: [PATCH] --- yaml --- r: 68351 b: refs/heads/master c:
 8fc0d085f521a2a76418f8f569cf1cd27f0e43d4 h: refs/heads/master i:   68349:
 802b2bf51f7dd1ee272f6eca665077f79b42d10e   68347:
 b3782d307681f20db86c6ebcb6200f9986c22166   68343:
 c04b9084fb5c38428fd8523ab0c2687a3461937f   68335:
 d97c4a997f0f8180cb96123b396fcfdce3498862   68319:
 6176e54ce97acddfaf51bf4ba53d7cdb52d8a2eb   68287:
 0d30168edd036a91aa802c57d1b90909aae91342   68223:
 63a3c4bf4ef2306fe70501cbb8bea7dbce5d1e6f   68095:
 0004d0fec4c59b678241a188f00626b0fef8a40c v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 2 +-
 trunk/drivers/kvm/svm.c      | 1 -
 trunk/drivers/kvm/vmx.c      | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 58aa104623c8..4b1fb25f322c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9eb829ced8c6f2e43a3a644ddf1279ffeee38a33
+refs/heads/master: 8fc0d085f521a2a76418f8f569cf1cd27f0e43d4
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index fc63de25d9b0..193197fb399e 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -1276,6 +1276,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 	r = x86_emulate_memop(&emulate_ctxt, &emulate_ops);
 
 	if ((r || vcpu->mmio_is_write) && run) {
+		run->exit_reason = KVM_EXIT_MMIO;
 		run->mmio.phys_addr = vcpu->mmio_phys_addr;
 		memcpy(run->mmio.data, vcpu->mmio_data, 8);
 		run->mmio.len = vcpu->mmio_size;
@@ -1937,7 +1938,6 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 			/*
 			 * Read-modify-write.  Back to userspace.
 			 */
-			kvm_run->exit_reason = KVM_EXIT_MMIO;
 			r = 0;
 			goto out;
 		}
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index 5c058fa1c8ad..850a1b1d86c5 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -928,7 +928,6 @@ static int pf_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 		return 1;
 	case EMULATE_DO_MMIO:
 		++vcpu->stat.mmio_exits;
-		kvm_run->exit_reason = KVM_EXIT_MMIO;
 		return 0;
 	case EMULATE_FAIL:
 		vcpu_printf(vcpu, "%s: emulate fail\n", __FUNCTION__);
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index f3e78187e892..2c4f01bea1fb 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -1610,7 +1610,6 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 			return 1;
 		case EMULATE_DO_MMIO:
 			++vcpu->stat.mmio_exits;
-			kvm_run->exit_reason = KVM_EXIT_MMIO;
 			return 0;
 		 case EMULATE_FAIL:
 			vcpu_printf(vcpu, "%s: emulate fail\n", __FUNCTION__);