Commit d6712df9 authored by Cornelia Huck's avatar Cornelia Huck Committed by Marcelo Tosatti

KVM: s390: Base infrastructure for enabling capabilities.

Make s390 support KVM_ENABLE_CAP.
Reviewed-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Acked-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent f379aae5
...@@ -913,7 +913,7 @@ documentation when it pops into existence). ...@@ -913,7 +913,7 @@ documentation when it pops into existence).
4.37 KVM_ENABLE_CAP 4.37 KVM_ENABLE_CAP
Capability: KVM_CAP_ENABLE_CAP Capability: KVM_CAP_ENABLE_CAP
Architectures: ppc Architectures: ppc, s390
Type: vcpu ioctl Type: vcpu ioctl
Parameters: struct kvm_enable_cap (in) Parameters: struct kvm_enable_cap (in)
Returns: 0 on success; -1 on error Returns: 0 on success; -1 on error
......
...@@ -140,6 +140,7 @@ int kvm_dev_ioctl_check_extension(long ext) ...@@ -140,6 +140,7 @@ int kvm_dev_ioctl_check_extension(long ext)
#endif #endif
case KVM_CAP_SYNC_REGS: case KVM_CAP_SYNC_REGS:
case KVM_CAP_ONE_REG: case KVM_CAP_ONE_REG:
case KVM_CAP_ENABLE_CAP:
r = 1; r = 1;
break; break;
case KVM_CAP_NR_VCPUS: case KVM_CAP_NR_VCPUS:
...@@ -808,6 +809,22 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr) ...@@ -808,6 +809,22 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
return 0; 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, long kvm_arch_vcpu_ioctl(struct file *filp,
unsigned int ioctl, unsigned long arg) unsigned int ioctl, unsigned long arg)
{ {
...@@ -894,6 +911,15 @@ long kvm_arch_vcpu_ioctl(struct file *filp, ...@@ -894,6 +911,15 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
r = 0; r = 0;
break; 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: default:
r = -ENOTTY; r = -ENOTTY;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment