History

Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD

The highlights are: * Enable VFIO device on PowerPC, from David Gibson * Optimizations to speed up IPIs between vcpus in HV KVM, from Suresh Warrier (who is also Suresh E. Warrier) * In-kernel handling of IOMMU hypercalls, and support for dynamic DMA windows (DDW), from Alexey Kardashevskiy.

Paolo Bonzini committed 10 years ago

Commit 61ec84f2 parents 433da86 58ded4223 files · +1005 −88Browse files

Showing the changes to include/uapi (1 of 23 files). Show all

Unified · Split

include/uapi/linux/kvm.h+3−0
@@ -862,6 +862,7 @@ struct kvm_ppc_smmu_info { · 861 unmodified lines
862862 #define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
863863 #define KVM_CAP_HYPERV_SYNIC 123
864864 #define KVM_CAP_S390_RI 124
865+#define KVM_CAP_SPAPR_TCE_64 125
865866
866867 #ifdef KVM_CAP_IRQ_ROUTING
867868
@@ -1154,6 +1155,8 @@ struct kvm_s390_ucas_mapping { · 286 unmodified lines
11541155 /* Available with KVM_CAP_PPC_ALLOC_HTAB */
11551156 #define KVM_PPC_ALLOCATE_HTAB _IOWR(KVMIO, 0xa7, __u32)
11561157 #define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct kvm_create_spapr_tce)
1158+#define KVM_CREATE_SPAPR_TCE_64 _IOW(KVMIO, 0xa8, \
1159+ struct kvm_create_spapr_tce_64)
11571160 /* Available with KVM_CAP_RMA */
11581161 #define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma)
11591162 /* Available with KVM_CAP_PPC_HTAB_FD */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t