summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-06-10 13:10:47 +0200
committerAvi Kivity <avi@redhat.com>2010-08-01 10:46:28 +0300
commit376d41ff2669617a1ef828466ad07a1be99d24d3 (patch)
tree1bba59c86da7fae20ac0619296a2d67797abfb87
parent3b5d13218667b3ca52efa52cec1d322163bf5465 (diff)
downloadlinux-376d41ff2669617a1ef828466ad07a1be99d24d3.tar.bz2
KVM: Fix KVM_SET_SIGNAL_MASK with arg == NULL
When the user passed in a NULL mask pass this on from the ioctl handler. Found by gcc 4.6's new warnings. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 78ed71ad6aa1..84a090644d9d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1547,7 +1547,7 @@ out_free2:
goto out;
p = &sigset;
}
- r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);
+ r = kvm_vcpu_ioctl_set_sigmask(vcpu, p);
break;
}
case KVM_GET_FPU: {