Commit a2e4e289 authored by Xiantao Zhang's avatar Xiantao Zhang Committed by Avi Kivity
Browse files

KVM: ia64: Use guest signal mask when blocking 



Before a vcpu blocks, it should switch to the guest signal mask to allow
signals to unblock it.

Signed-off-by: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c41ef344

arch/ia64/kvm/kvm-ia64.c

+6 −6
Original line number Diff line number Diff line
@@ -673,16 +673,16 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


	vcpu_load(vcpu);



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);



	if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {

		kvm_vcpu_block(vcpu);

		clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

		vcpu_put(vcpu);

		return -EAGAIN;

		r = -EAGAIN;

		goto out;

	}



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);



	if (vcpu->mmio_needed) {

		memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);

		kvm_set_mmio_data(vcpu);
@@ -690,7 +690,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		vcpu->mmio_needed = 0;

	}

	r = __vcpu_run(vcpu, kvm_run);



out:

	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);