diff options
| author | Cornelia Huck | 2012-12-20 15:32:11 +0100 |
|---|---|---|
| committer | Marcelo Tosatti | 2013-01-07 22:53:42 +0100 |
| commit | d6712df95bcfea597fc3ea2405ec13e8b69a7b8c (patch) | |
| tree | 5079dabfbf47e1d43af960248e93193e768d02bc /arch/s390/kvm/kvm-s390.c | |
| parent | KVM: s390: In-kernel handling of I/O instructions. (diff) | |
| download | kernel-qcow2-linux-d6712df95bcfea597fc3ea2405ec13e8b69a7b8c.tar.gz kernel-qcow2-linux-d6712df95bcfea597fc3ea2405ec13e8b69a7b8c.tar.xz kernel-qcow2-linux-d6712df95bcfea597fc3ea2405ec13e8b69a7b8c.zip | |
KVM: s390: Base infrastructure for enabling capabilities.
Make s390 support KVM_ENABLE_CAP.
Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index f718bc65835c..5ff26033825c 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -140,6 +140,7 @@ int kvm_dev_ioctl_check_extension(long ext) #endif case KVM_CAP_SYNC_REGS: case KVM_CAP_ONE_REG: + case KVM_CAP_ENABLE_CAP: r = 1; break; case KVM_CAP_NR_VCPUS: @@ -808,6 +809,22 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr) return 0; } +static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, + struct kvm_enable_cap *cap) +{ + int r; + + if (cap->flags) + return -EINVAL; + + switch (cap->cap) { + default: + r = -EINVAL; + break; + } + return r; +} + long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) { @@ -894,6 +911,15 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = 0; break; } + case KVM_ENABLE_CAP: + { + struct kvm_enable_cap cap; + r = -EFAULT; + if (copy_from_user(&cap, argp, sizeof(cap))) + break; + r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap); + break; + } default: r = -ENOTTY; } |