Commit 1e2277ed authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-ppc-cap-210' into kvm-master 

By request of Nick Piggin:

> Patch 3 requires a KVM_CAP_PPC number allocated. QEMU maintainers are
> happy with it (link in changelog) just waiting on KVM upstreaming. Do
> you have objections to the series going to ppc/kvm tree first, or
> another option is you could take patch 3 alone first (it's relatively
> independent of the other 2) and ppc/kvm gets it from you?
parents ec756e40 93b71801

Documentation/virt/kvm/api.rst

+14 −0
Original line number Diff line number Diff line
@@ -6997,6 +6997,20 @@ indicated by the fd to the VM this is called on. 
This is intended to support intra-host migration of VMs between userspace VMMs,

upgrading the VMM process without interrupting the guest.



7.30 KVM_CAP_PPC_AIL_MODE_3

-------------------------------



:Capability: KVM_CAP_PPC_AIL_MODE_3

:Architectures: ppc

:Type: vm



This capability indicates that the kernel supports the mode 3 setting for the

"Address Translation Mode on Interrupt" aka "Alternate Interrupt Location"

resource that is controlled with the H_SET_MODE hypercall.



This capability allows a guest kernel to use a better-performance mode for

handling interrupts and system calls.



8. Other capabilities.

======================

include/uapi/linux/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_VM_GPA_BITS 207

#define KVM_CAP_XSAVE2 208

#define KVM_CAP_SYS_ATTRIBUTES 209

#define KVM_CAP_PPC_AIL_MODE_3 210



#ifdef KVM_CAP_IRQ_ROUTING

tools/include/uapi/linux/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_VM_GPA_BITS 207

#define KVM_CAP_XSAVE2 208

#define KVM_CAP_SYS_ATTRIBUTES 209

#define KVM_CAP_PPC_AIL_MODE_3 210



#ifdef KVM_CAP_IRQ_ROUTING