aboutsummaryrefslogtreecommitdiff
path: root/arch/s390/kvm
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-05-13 12:35:17 +0300
committerAvi Kivity <avi@redhat.com>2010-08-01 10:35:48 +0300
commit93736624635235cc5372ffca6d62816d02170724 (patch)
tree801205636b4d6da4127a6d33873902d690431f52 /arch/s390/kvm
parent19483d144023f7f4817dedafe26d5fe9ff2e7087 (diff)
downloadlinux-linaro-android-93736624635235cc5372ffca6d62816d02170724.tar.gz
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/s390/kvm')
-rw-r--r--arch/s390/kvm/kvm-s390.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index fd169f658bf..0cb0da7822d 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -638,16 +638,16 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
void __user *argp = (void __user *)arg;
long r;
- if (ioctl == KVM_S390_INTERRUPT) {
+ switch (ioctl) {
+ case KVM_S390_INTERRUPT: {
struct kvm_s390_interrupt s390int;
+ r = -EFAULT;
if (copy_from_user(&s390int, argp, sizeof(s390int)))
- return -EFAULT;
- return kvm_s390_inject_vcpu(vcpu, &s390int);
+ break;
+ r = kvm_s390_inject_vcpu(vcpu, &s390int);
+ break;
}
-
- vcpu_load(vcpu);
- switch (ioctl) {
case KVM_S390_STORE_STATUS:
r = kvm_s390_vcpu_store_status(vcpu, arg);
break;
@@ -666,7 +666,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
default:
r = -EINVAL;
}
- vcpu_put(vcpu);
return r;
}