From 9215bf767197224d383926f9a955fe8accdc948e Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Thu, 1 Mar 2007 16:20:40 +0200
Subject: [PATCH] --- yaml --- r: 54062 b: refs/heads/master c:
 106b552b43beac2694df5fbafc8f125a72df5f65 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 5 -----
 trunk/include/linux/kvm.h    | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f0c9c76cffbc..624f0cbeb851 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06465c5a3aa9948a7b00af49cd22ed8f235cdb0f
+refs/heads/master: 106b552b43beac2694df5fbafc8f125a72df5f65
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index caec54fbf07f..5d24203afd20 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -1588,11 +1588,6 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 	/* re-sync apic's tpr */
 	vcpu->cr8 = kvm_run->cr8;
 
-	if (kvm_run->emulated) {
-		kvm_arch_ops->skip_emulated_instruction(vcpu);
-		kvm_run->emulated = 0;
-	}
-
 	if (kvm_run->io_completed) {
 		if (vcpu->pio_pending)
 			complete_pio(vcpu);
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
index 15e23bc06e8b..c6dd4a79b74b 100644
--- a/trunk/include/linux/kvm.h
+++ b/trunk/include/linux/kvm.h
@@ -51,10 +51,9 @@ enum kvm_exit_reason {
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
 	/* in */
-	__u32 emulated;  /* skip current instruction */
 	__u32 io_completed; /* mmio/pio request completed */
 	__u8 request_interrupt_window;
-	__u8 padding1[7];
+	__u8 padding1[3];
 
 	/* out */
 	__u32 exit_type;