]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
KVM: Remove unused 'instruction_length'
authorAvi Kivity <avi@qumranet.com>
Sun, 29 Apr 2007 13:25:49 +0000 (16:25 +0300)
committerAvi Kivity <avi@qumranet.com>
Thu, 3 May 2007 07:52:32 +0000 (10:52 +0300)
As we no longer emulate in userspace, this is meaningless.  We don't
compute it on SVM anyway.

Signed-off-by: Avi Kivity <avi@qumranet.com>
drivers/kvm/vmx.c
include/linux/kvm.h

index 5a2a68dec6bf47447782eb851f619b52995d2e63..724db0027f0003ceb62135d7411716806d4e897a 100644 (file)
@@ -1783,7 +1783,6 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
                                exit_reason != EXIT_REASON_EXCEPTION_NMI )
                printk(KERN_WARNING "%s: unexpected, valid vectoring info and "
                       "exit reason is 0x%x\n", __FUNCTION__, exit_reason);
-       kvm_run->instruction_length = vmcs_read32(VM_EXIT_INSTRUCTION_LEN);
        if (exit_reason < kvm_vmx_max_exit_handlers
            && kvm_vmx_exit_handlers[exit_reason])
                return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run);
index 738c2f50c7748a16239a54509ec9f3ee39dc8a76..e6edca81ab847f54ff920b2b4b346e3ec60400c1 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/types.h>
 #include <linux/ioctl.h>
 
-#define KVM_API_VERSION 11
+#define KVM_API_VERSION 12
 
 /*
  * Architectural interrupt line count, and the size of the bitmap needed
@@ -63,10 +63,9 @@ struct kvm_run {
 
        /* out */
        __u32 exit_reason;
-       __u32 instruction_length;
        __u8 ready_for_interrupt_injection;
        __u8 if_flag;
-       __u8 padding2[6];
+       __u8 padding2[2];
 
        /* in (pre_kvm_run), out (post_kvm_run) */
        __u64 cr8;