linux-next: manual merge of the kvm-ppc tree with the kvm tree

[Stephen Rothwell]

Hi Alexander,

Today's linux-next merge of the kvm-ppc tree got a conflict in
Documentation/virtual/kvm/api.txt between commit 8a366a4bae15 ("KVM:
s390: document KVM_CAP_S390_IRQCHIP") from the kvm tree and commit
dfc17cc2ded1 ("KVM: PPC: Book3S: Controls for in-kernel sPAPR hypercall
handling") from the kvm-ppc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc Documentation/virtual/kvm/api.txt
index 68cda1fc3d52,69553183ef0f..000000000000
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@@ -2931,13 -2863,12 +2931,13 @@@ The fields in each entry are defined a
           this function/index combination
  
  
- 6. Capabilities that can be enabled
- -----------------------------------
+ 6. Capabilities that can be enabled on vCPUs
+ --------------------------------------------
  
 -There are certain capabilities that change the behavior of the virtual CPU when
 -enabled. To enable them, please see section 4.37. Below you can find a list of
 -capabilities and what their effect on the vCPU is when enabling them.
 +There are certain capabilities that change the behavior of the virtual CPU or
 +the virtual machine when enabled. To enable them, please see section 4.37.
 +Below you can find a list of capabilities and what their effect on the vCPU or
 +the virtual machine is when enabling them.
  
  The following information is provided along with the description:
  
@@@ -3083,11 -3003,43 +3083,51 @@@ Parameters: args[0] is the XICS device 
  
  This capability connects the vcpu to an in-kernel XICS device.
  
 +6.8 KVM_CAP_S390_IRQCHIP
 +
 +Architectures: s390
 +Target: vm
 +Parameters: none
 +
 +This capability enables the in-kernel irqchip for s390. Please refer to
 +"4.24 KVM_CREATE_IRQCHIP" for details.
+ 
+ 7. Capabilities that can be enabled on VMs
+ ------------------------------------------
+ 
+ There are certain capabilities that change the behavior of the virtual
+ machine when enabled. To enable them, please see section 4.37. Below
+ you can find a list of capabilities and what their effect on the VM
+ is when enabling them.
+ 
+ The following information is provided along with the description:
+ 
+   Architectures: which instruction set architectures provide this ioctl.
+       x86 includes both i386 and x86_64.
+ 
+   Parameters: what parameters are accepted by the capability.
+ 
+   Returns: the return value.  General error numbers (EBADF, ENOMEM, EINVAL)
+       are not detailed, but errors with specific meanings are.
+ 
+ 
+ 7.1 KVM_CAP_PPC_ENABLE_HCALL
+ 
+ Architectures: ppc
+ Parameters: args[0] is the sPAPR hcall number
+ 	    args[1] is 0 to disable, 1 to enable in-kernel handling
+ 
+ This capability controls whether individual sPAPR hypercalls (hcalls)
+ get handled by the kernel or not.  Enabling or disabling in-kernel
+ handling of an hcall is effective across the VM.  On creation, an
+ initial set of hcalls are enabled for in-kernel handling, which
+ consists of those hcalls for which in-kernel handlers were implemented
+ before this capability was implemented.  If disabled, the kernel will
+ not to attempt to handle the hcall, but will always exit to userspace
+ to handle it.  Note that it may not make sense to enable some and
+ disable others of a group of related hcalls, but KVM does not prevent
+ userspace from doing that.
+ 
+ If the hcall number specified is not one that has an in-kernel
+ implementation, the KVM_ENABLE_CAP ioctl will fail with an EINVAL
+ error.

Attachment: signature.asc
Description: PGP signature