Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f629cf84 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: skip_emulated_instruction() decode instruction if size is not known 



Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 923c61bb

arch/x86/kvm/svm.c

+5 −6
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu) 
	struct vcpu_svm *svm = to_svm(vcpu);



	if (!svm->next_rip) {

		if (emulate_instruction(vcpu, vcpu->run, 0, 0, EMULTYPE_SKIP) !=

				EMULATE_DONE)

			printk(KERN_DEBUG "%s: NOP\n", __func__);

		return;

	}
@@ -1868,11 +1870,8 @@ static int task_switch_interception(struct vcpu_svm *svm, 
	if (reason != TASK_SWITCH_GATE ||

	    int_type == SVM_EXITINTINFO_TYPE_SOFT ||

	    (int_type == SVM_EXITINTINFO_TYPE_EXEPT &&

	     (int_vec == OF_VECTOR || int_vec == BP_VECTOR))) {

		if (emulate_instruction(&svm->vcpu, kvm_run, 0, 0,

					EMULTYPE_SKIP) != EMULATE_DONE)

			return 0;

	}

	     (int_vec == OF_VECTOR || int_vec == BP_VECTOR)))

		skip_emulated_instruction(&svm->vcpu);



	return kvm_task_switch(&svm->vcpu, tss_selector, reason);

}