diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2013-10-23 12:26:34 -0400 |
---|---|---|
committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2014-03-21 08:42:39 -0400 |
commit | d938dc55225a7212e7f31c5a8571da304cc3de16 (patch) | |
tree | 082b29c296ab2458d8365969bb85af23fe4a0dde /Documentation/virtual | |
parent | 36c95494609cd6d2541c08e806b4d6bc401bc53f (diff) |
KVM: Add per-vm capability enablement.
Allow KVM_ENABLE_CAP to act on a vm as well as on a vcpu. This makes more
sense when the caller wants to enable a vm-related capability.
s390 will be the first user; wire it up.
Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'Documentation/virtual')
-rw-r--r-- | Documentation/virtual/kvm/api.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 4714f282a43e..faf6fe9772c7 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt | |||
@@ -932,9 +932,9 @@ documentation when it pops into existence). | |||
932 | 932 | ||
933 | 4.37 KVM_ENABLE_CAP | 933 | 4.37 KVM_ENABLE_CAP |
934 | 934 | ||
935 | Capability: KVM_CAP_ENABLE_CAP | 935 | Capability: KVM_CAP_ENABLE_CAP, KVM_CAP_ENABLE_CAP_VM |
936 | Architectures: ppc, s390 | 936 | Architectures: ppc, s390 |
937 | Type: vcpu ioctl | 937 | Type: vcpu ioctl, vm ioctl (with KVM_CAP_ENABLE_CAP_VM) |
938 | Parameters: struct kvm_enable_cap (in) | 938 | Parameters: struct kvm_enable_cap (in) |
939 | Returns: 0 on success; -1 on error | 939 | Returns: 0 on success; -1 on error |
940 | 940 | ||
@@ -965,6 +965,8 @@ function properly, this is the place to put them. | |||
965 | __u8 pad[64]; | 965 | __u8 pad[64]; |
966 | }; | 966 | }; |
967 | 967 | ||
968 | The vcpu ioctl should be used for vcpu-specific capabilities, the vm ioctl | ||
969 | for vm-wide capabilities. | ||
968 | 970 | ||
969 | 4.38 KVM_GET_MP_STATE | 971 | 4.38 KVM_GET_MP_STATE |
970 | 972 | ||