Commit 457459c3 authored Apr 16, 2009 by Jes Sorensen Committed by Avi Kivity Jun 10, 2009

KVM: ia64: restore irq state before calling kvm_vcpu_init



Make sure to restore the psr after calling kvm_insert_vmm_mapping()
which calls ia64_itr_entry() as it disables local interrupts and
kvm_vcpu_init() may sleep.

Avoids a warning from the lock debugging code.

Signed-off-by: Jes Sorensen <jes@sgi.com>
Acked-by : Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

parent f9b647ad

arch/ia64/kvm/kvm-ia64.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1290,6 +1290,7 @@ static int vti_vcpu_setup(struct kvm_vcpu *vcpu, int id)

		local_irq_save(psr);
		r = kvm_insert_vmm_mapping(vcpu);
		local_irq_restore(psr);
		if (r)
		goto fail;
		r = kvm_vcpu_init(vcpu, vcpu->kvm, id);
		@@ -1307,13 +1308,11 @@ static int vti_vcpu_setup(struct kvm_vcpu *vcpu, int id)
		goto uninit;

		kvm_purge_vmm_mapping(vcpu);
		local_irq_restore(psr);

		return 0;
		uninit:
		kvm_vcpu_uninit(vcpu);
		fail:
		local_irq_restore(psr);
		return r;
		}