diff options
| author | Avi Kivity <avi@redhat.com> | 2010-05-13 09:35:17 (GMT) |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-08-01 07:35:48 (GMT) |
| commit | 93736624635235cc5372ffca6d62816d02170724 (patch) | |
| tree | 801205636b4d6da4127a6d33873902d690431f52 /arch/powerpc/kvm | |
| parent | 19483d144023f7f4817dedafe26d5fe9ff2e7087 (diff) | |
| download | linux-fsl-qoriq-93736624635235cc5372ffca6d62816d02170724.tar.xz | |
KVM: Consolidate arch specific vcpu ioctl locking
Now that all arch specific ioctls have centralized locking, it is easy to
move it to the central dispatcher.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm')
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index caeed7b..a1d8750 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -512,17 +512,16 @@ long kvm_arch_vcpu_ioctl(struct file *filp, void __user *argp = (void __user *)arg; long r; - if (ioctl == KVM_INTERRUPT) { + switch (ioctl) { + case KVM_INTERRUPT: { struct kvm_interrupt irq; r = -EFAULT; if (copy_from_user(&irq, argp, sizeof(irq))) - goto out_nolock; + goto out; r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); - goto out_nolock; + goto out; } - vcpu_load(vcpu); - switch (ioctl) { case KVM_ENABLE_CAP: { struct kvm_enable_cap cap; @@ -537,8 +536,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp, } out: - vcpu_put(vcpu); -out_nolock: return r; } |