diff options
-rw-r--r-- | drivers/kvm/vmx.c | 1 | ||||
-rw-r--r-- | include/linux/kvm.h | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 5a2a68dec6bf..724db0027f00 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c | |||
@@ -1783,7 +1783,6 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) | |||
1783 | exit_reason != EXIT_REASON_EXCEPTION_NMI ) | 1783 | exit_reason != EXIT_REASON_EXCEPTION_NMI ) |
1784 | printk(KERN_WARNING "%s: unexpected, valid vectoring info and " | 1784 | printk(KERN_WARNING "%s: unexpected, valid vectoring info and " |
1785 | "exit reason is 0x%x\n", __FUNCTION__, exit_reason); | 1785 | "exit reason is 0x%x\n", __FUNCTION__, exit_reason); |
1786 | kvm_run->instruction_length = vmcs_read32(VM_EXIT_INSTRUCTION_LEN); | ||
1787 | if (exit_reason < kvm_vmx_max_exit_handlers | 1786 | if (exit_reason < kvm_vmx_max_exit_handlers |
1788 | && kvm_vmx_exit_handlers[exit_reason]) | 1787 | && kvm_vmx_exit_handlers[exit_reason]) |
1789 | return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run); | 1788 | return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run); |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 738c2f50c774..e6edca81ab84 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <asm/types.h> | 11 | #include <asm/types.h> |
12 | #include <linux/ioctl.h> | 12 | #include <linux/ioctl.h> |
13 | 13 | ||
14 | #define KVM_API_VERSION 11 | 14 | #define KVM_API_VERSION 12 |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Architectural interrupt line count, and the size of the bitmap needed | 17 | * Architectural interrupt line count, and the size of the bitmap needed |
@@ -63,10 +63,9 @@ struct kvm_run { | |||
63 | 63 | ||
64 | /* out */ | 64 | /* out */ |
65 | __u32 exit_reason; | 65 | __u32 exit_reason; |
66 | __u32 instruction_length; | ||
67 | __u8 ready_for_interrupt_injection; | 66 | __u8 ready_for_interrupt_injection; |
68 | __u8 if_flag; | 67 | __u8 if_flag; |
69 | __u8 padding2[6]; | 68 | __u8 padding2[2]; |
70 | 69 | ||
71 | /* in (pre_kvm_run), out (post_kvm_run) */ | 70 | /* in (pre_kvm_run), out (post_kvm_run) */ |
72 | __u64 cr8; | 71 | __u64 cr8; |