Commit 2ff81f70 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Remove unused 'instruction_length' 



As we no longer emulate in userspace, this is meaningless.  We don't
compute it on SVM anyway.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 02c83209

drivers/kvm/vmx.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1783,7 +1783,6 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
				exit_reason != EXIT_REASON_EXCEPTION_NMI )

				exit_reason != EXIT_REASON_EXCEPTION_NMI )

		printk(KERN_WARNING "%s: unexpected, valid vectoring info and "

		printk(KERN_WARNING "%s: unexpected, valid vectoring info and "

		       "exit reason is 0x%x\n", __FUNCTION__, exit_reason);

		       "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

	if (exit_reason < kvm_vmx_max_exit_handlers

	    && kvm_vmx_exit_handlers[exit_reason])

	    && kvm_vmx_exit_handlers[exit_reason])

		return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run);

		return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run);

include/linux/kvm.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <asm/types.h>

#include <asm/types.h>

#include <linux/ioctl.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

 * Architectural interrupt line count, and the size of the bitmap needed
@@ -63,10 +63,9 @@ struct kvm_run { 




	/* out */

	/* out */

	__u32 exit_reason;

	__u32 exit_reason;

	__u32 instruction_length;

	__u8 ready_for_interrupt_injection;

	__u8 ready_for_interrupt_injection;

	__u8 if_flag;

	__u8 if_flag;

	__u8 padding2[6];

	__u8 padding2[2];





	/* in (pre_kvm_run), out (post_kvm_run) */

	/* in (pre_kvm_run), out (post_kvm_run) */

	__u64 cr8;

	__u64 cr8;