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>

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index caec54fbf07faed2814cc4312bfbf83ad8d74176..5d24203afd204bca89cf050d8538dfb6589becf9 100644 (file)
--- 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);

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 15e23bc06e8b2acb32a5028368d50a3812278f7b..c6dd4a79b74b9fd6e76929a472b712d5656ed4be 100644 (file)
--- a/include/linux/kvm.h
+++ b/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;