History

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM update from Paolo Bonzini: "3.19 changes for KVM: - spring cleaning: removed support for IA64, and for hardware- assisted virtualization on the PPC970 - ARM, PPC, s390 all had only small fixes For x86: - small performance improvements (though only on weird guests) - usual round of hardware-compliancy fixes from Nadav - APICv fixes - XSAVES support for hosts and guests. XSAVES hosts were broken because the (non-KVM) XSAVES patches inadvertently changed the KVM userspace ABI whenever XSAVES was enabled; hence, this part is going to stable. Guest support is just a matter of exposing the feature and CPUID leaves support" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (179 commits) KVM: move APIC types to arch/x86/ KVM: PPC: Book3S: Enable in-kernel XICS emulation by default KVM: PPC: Book3S HV: Improve H_CONFER implementation KVM: PPC: Book3S HV: Fix endianness of instruction obtained from HEIR register KVM: PPC: Book3S HV: Remove code for PPC970 processors KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions KVM: PPC: Book3S HV: Simplify locking around stolen time calculations arch: powerpc: kvm: book3s_paired_singles.c: Remove unused function arch: powerpc: kvm: book3s_pr.c: Remove unused function arch: powerpc: kvm: book3s.c: Remove some unused functions arch: powerpc: kvm: book3s_32_mmu.c: Remove unused function KVM: PPC: Book3S HV: Check wait conditions before sleeping in kvmppc_vcore_blocked KVM: PPC: Book3S HV: ptes are big endian KVM: PPC: Book3S HV: Fix inaccuracies in ICP emulation for H_IPI KVM: PPC: Book3S HV: Fix KSM memory corruption KVM: PPC: Book3S HV: Fix an issue where guest is paused on receiving HMI KVM: PPC: Book3S HV: Fix computation of tlbie operand KVM: PPC: Book3S HV: Add missing HPTE unlock KVM: PPC: BookE: Improve irq inject tracepoint arm/arm64: KVM: Require in-kernel vgic for the arch timers ...

Linus Torvalds committed 11 years ago

Commit 66dcff82 parents 91ed9e8 2c4aa55114 files · +3551 −16095Browse files

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

Unified · Split

include/uapi/linux/kvm.h+0−11
@@ -647,11 +647,7 @@ struct kvm_ppc_smmu_info { · 646 unmodified lines
647#define KVM_CAP_MP_STATE 14647#define KVM_CAP_MP_STATE 14
648#define KVM_CAP_COALESCED_MMIO 15648#define KVM_CAP_COALESCED_MMIO 15
649#define KVM_CAP_SYNC_MMU 16 /* Changes to host mmap are reflected in guest */649#define KVM_CAP_SYNC_MMU 16 /* Changes to host mmap are reflected in guest */
650#define KVM_CAP_DEVICE_ASSIGNMENT 17
651#define KVM_CAP_IOMMU 18650#define KVM_CAP_IOMMU 18
652#ifdef __KVM_HAVE_MSI
653#define KVM_CAP_DEVICE_MSI 20
654#endif
655/* Bug in KVM_SET_USER_MEMORY_REGION fixed: */651/* Bug in KVM_SET_USER_MEMORY_REGION fixed: */
656#define KVM_CAP_DESTROY_MEMORY_REGION_WORKS 21652#define KVM_CAP_DESTROY_MEMORY_REGION_WORKS 21
657#define KVM_CAP_USER_NMI 22653#define KVM_CAP_USER_NMI 22
@@ -663,10 +659,6 @@ struct kvm_ppc_smmu_info { · 5 unmodified lines
663#endif659#endif
664#define KVM_CAP_IRQ_ROUTING 25660#define KVM_CAP_IRQ_ROUTING 25
665#define KVM_CAP_IRQ_INJECT_STATUS 26661#define KVM_CAP_IRQ_INJECT_STATUS 26
666#define KVM_CAP_DEVICE_DEASSIGNMENT 27
667#ifdef __KVM_HAVE_MSIX
668#define KVM_CAP_DEVICE_MSIX 28
669#endif
670#define KVM_CAP_ASSIGN_DEV_IRQ 29662#define KVM_CAP_ASSIGN_DEV_IRQ 29
671/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */663/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
672#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30664#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
@@ -1107,9 +1099,6 @@ struct kvm_s390_ucas_mapping { · 434 unmodified lines
1107#define KVM_X86_SETUP_MCE _IOW(KVMIO, 0x9c, __u64)1099#define KVM_X86_SETUP_MCE _IOW(KVMIO, 0x9c, __u64)
1108#define KVM_X86_GET_MCE_CAP_SUPPORTED _IOR(KVMIO, 0x9d, __u64)1100#define KVM_X86_GET_MCE_CAP_SUPPORTED _IOR(KVMIO, 0x9d, __u64)
1109#define KVM_X86_SET_MCE _IOW(KVMIO, 0x9e, struct kvm_x86_mce)1101#define KVM_X86_SET_MCE _IOW(KVMIO, 0x9e, struct kvm_x86_mce)
1110/* IA64 stack access */
1111#define KVM_IA64_VCPU_GET_STACK _IOR(KVMIO, 0x9a, void *)
1112#define KVM_IA64_VCPU_SET_STACK _IOW(KVMIO, 0x9b, void *)
1113/* Available with KVM_CAP_VCPU_EVENTS */1102/* Available with KVM_CAP_VCPU_EVENTS */
1114#define KVM_GET_VCPU_EVENTS _IOR(KVMIO, 0x9f, struct kvm_vcpu_events)1103#define KVM_GET_VCPU_EVENTS _IOR(KVMIO, 0x9f, struct kvm_vcpu_events)
1115#define KVM_SET_VCPU_EVENTS _IOW(KVMIO, 0xa0, struct kvm_vcpu_events)1104#define KVM_SET_VCPU_EVENTS _IOW(KVMIO, 0xa0, struct kvm_vcpu_events)