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

Commit 022a9308 authored Jan 05, 2007 by Dor Laor Committed by Linus Torvalds Jan 05, 2007

[PATCH] KVM: Simplify test for interrupt window



No need to test for rflags.if as both VT and SVM specs assure us that on exit
caused from interrupt window opening, 'if' is set.

Signed-off-by: Dor Laor <dor.laor@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 68a99f6d

drivers/kvm/svm.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1206,8 +1206,7 @@ static int interrupt_window_interception(struct kvm_vcpu *vcpu,
		* possible
		*/
		if (kvm_run->request_interrupt_window &&
		!vcpu->irq_summary &&
		(vcpu->svm->vmcb->save.rflags & X86_EFLAGS_IF)) {
		!vcpu->irq_summary) {
		++kvm_stat.irq_window_exits;
		kvm_run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN;
		return 0;

drivers/kvm/vmx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1604,8 +1604,7 @@ static int handle_interrupt_window(struct kvm_vcpu *vcpu,
		* possible
		*/
		if (kvm_run->request_interrupt_window &&
		!vcpu->irq_summary &&
		(vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_IF)) {
		!vcpu->irq_summary) {
		kvm_run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN;
		++kvm_stat.irq_window_exits;
		return 0;