From 1ca5a37ef6abbd307985ab304d144538fff44f5e Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 29 Apr 2007 16:25:49 +0300 Subject: [PATCH] --- yaml --- r: 54119 b: refs/heads/master c: 2ff81f70b56dc1cdd3bf2f08414608069db6ef1a h: refs/heads/master i: 54117: e34e0dadfb85f057b3726b3856e78be1bfb419a0 54115: 8e9568523b8ff156f89d7381da73106234d20575 54111: 535dd18a82b7f750a9c1981bbb7a06a8d68f6a60 v: v3 --- [refs] | 2 +- trunk/drivers/kvm/vmx.c | 1 - trunk/include/linux/kvm.h | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ea65143f5fd4..595df5941a7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02c83209726270ddf9597deabc45e08f6fc3942c +refs/heads/master: 2ff81f70b56dc1cdd3bf2f08414608069db6ef1a diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index 5a2a68dec6bf..724db0027f00 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/drivers/kvm/vmx.c @@ -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); diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 738c2f50c774..e6edca81ab84 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -11,7 +11,7 @@ #include #include -#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;