summaryrefslogtreecommitdiffstats
path: root/drivers/kvm/kvm_main.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-03-01 15:20:40 +0100
committerAvi Kivity <avi@qumranet.com>2007-05-03 09:52:23 +0200
commit106b552b43beac2694df5fbafc8f125a72df5f65 (patch)
tree3d26f1f7148eaa4cb6e6d882418db283d9f2d29f /drivers/kvm/kvm_main.c
parentKVM: Handle cpuid in the kernel instead of punting to userspace (diff)
downloadlinux-106b552b43beac2694df5fbafc8f125a72df5f65.tar.xz
linux-106b552b43beac2694df5fbafc8f125a72df5f65.zip
KVM: Remove the 'emulated' field from the userspace interface
We no longer emulate single instructions in userspace. Instead, we service mmio or pio requests. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
-rw-r--r--drivers/kvm/kvm_main.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index caec54fbf07f..5d24203afd20 100644
--- a/drivers/kvm/kvm_main.c
+++ b/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);