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>

1 files changed, 4 insertions, 7 deletions

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index caeed7b31bf9..a1d87508892e 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;
 }