diff options
| author | Avi Kivity <avi@redhat.com> | 2010-05-13 12:30:43 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-08-01 10:35:48 +0300 |
| commit | 19483d144023f7f4817dedafe26d5fe9ff2e7087 (patch) | |
| tree | 5d0979cc9668a2554be05a399a94ff01c597afca | |
| parent | bc923cc93b7719576f20687e4cb07751601fbbb3 (diff) | |
KVM: PPC: Centralize locking of arch specific vcpu ioctls
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index e0fae7a618ca..caeed7b31bf9 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -512,15 +512,17 @@ long kvm_arch_vcpu_ioctl(struct file *filp, void __user *argp = (void __user *)arg; long r; - switch (ioctl) { - case KVM_INTERRUPT: { + if (ioctl == KVM_INTERRUPT) { struct kvm_interrupt irq; r = -EFAULT; if (copy_from_user(&irq, argp, sizeof(irq))) - goto out; + goto out_nolock; r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); - break; + goto out_nolock; } + + vcpu_load(vcpu); + switch (ioctl) { case KVM_ENABLE_CAP: { struct kvm_enable_cap cap; @@ -535,6 +537,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp, } out: + vcpu_put(vcpu); +out_nolock: return r; } |