Skip to content

Commit 1e2277e

Browse files
committed
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?
2 parents ec756e4 + 93b7180 commit 1e2277e

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

Documentation/virt/kvm/api.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6997,6 +6997,20 @@ indicated by the fd to the VM this is called on.
69976997
This is intended to support intra-host migration of VMs between userspace VMMs,
69986998
upgrading the VMM process without interrupting the guest.
69996999

7000+
7.30 KVM_CAP_PPC_AIL_MODE_3
7001+
-------------------------------
7002+
7003+
:Capability: KVM_CAP_PPC_AIL_MODE_3
7004+
:Architectures: ppc
7005+
:Type: vm
7006+
7007+
This capability indicates that the kernel supports the mode 3 setting for the
7008+
"Address Translation Mode on Interrupt" aka "Alternate Interrupt Location"
7009+
resource that is controlled with the H_SET_MODE hypercall.
7010+
7011+
This capability allows a guest kernel to use a better-performance mode for
7012+
handling interrupts and system calls.
7013+
70007014
8. Other capabilities.
70017015
======================
70027016

include/uapi/linux/kvm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,7 @@ struct kvm_ppc_resize_hpt {
11341134
#define KVM_CAP_VM_GPA_BITS 207
11351135
#define KVM_CAP_XSAVE2 208
11361136
#define KVM_CAP_SYS_ATTRIBUTES 209
1137+
#define KVM_CAP_PPC_AIL_MODE_3 210
11371138

11381139
#ifdef KVM_CAP_IRQ_ROUTING
11391140

tools/include/uapi/linux/kvm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,7 @@ struct kvm_ppc_resize_hpt {
11341134
#define KVM_CAP_VM_GPA_BITS 207
11351135
#define KVM_CAP_XSAVE2 208
11361136
#define KVM_CAP_SYS_ATTRIBUTES 209
1137+
#define KVM_CAP_PPC_AIL_MODE_3 210
11371138

11381139
#ifdef KVM_CAP_IRQ_ROUTING
11391140

0 commit comments

Comments
 (0)