History

Merge tag 'kvm-4.13-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull more KVM updates from Radim Krčmář: "Second batch of KVM updates for v4.13 Common: - add uevents for VM creation/destruction - annotate and properly access RCU-protected objects s390: - rename IOCTL added in the first v4.13 merge x86: - emulate VMLOAD VMSAVE feature in SVM - support paravirtual asynchronous page fault while nested - add Hyper-V userspace interfaces for better migration - improve master clock corner cases - extend internal error reporting after EPT misconfig - correct single-stepping of emulated instructions in SVM - handle MCE during VM entry - fix nVMX VM entry checks and nVMX VMCS shadowing" * tag 'kvm-4.13-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (28 commits) kvm: x86: hyperv: make VP_INDEX managed by userspace KVM: async_pf: Let guest support delivery of async_pf from guest mode KVM: async_pf: Force a nested vmexit if the injected #PF is async_pf KVM: async_pf: Add L1 guest async_pf #PF vmexit handler KVM: x86: Simplify kvm_x86_ops->queue_exception parameter list kvm: x86: hyperv: add KVM_CAP_HYPERV_SYNIC2 KVM: x86: make backwards_tsc_observed a per-VM variable KVM: trigger uevents when creating or destroying a VM KVM: SVM: Enable Virtual VMLOAD VMSAVE feature KVM: SVM: Add Virtual VMLOAD VMSAVE feature definition KVM: SVM: Rename lbr_ctl field in the vmcb control area KVM: SVM: Prepare for new bit definition in lbr_ctl KVM: SVM: handle singlestep exception when skipping emulated instructions KVM: x86: take slots_lock in kvm_free_pit KVM: s390: Fix KVM_S390_GET_CMMA_BITS ioctl definition kvm: vmx: Properly handle machine check during VM-entry KVM: x86: update master clock before computing kvmclock_offset kvm: nVMX: Shadow "high" parts of shadowed 64-bit VMCS fields kvm: nVMX: Fix nested_vmx_check_msr_bitmap_controls kvm: nVMX: Validate the I/O bitmaps on nested VM-entry ...

Linus Torvalds committed 9 years ago

Commit e37a07e2 parents a80099a d3457c821 files · +470 −207Browse files

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

Unified · Split

include/uapi/linux/kvm.h+3−1
@@ -927,6 +927,8 @@ struct kvm_ppc_resize_hpt { · 926 unmodified lines
927927 #define KVM_CAP_S390_CMMA_MIGRATION 145
928928 #define KVM_CAP_PPC_FWNMI 146
929929 #define KVM_CAP_PPC_SMT_POSSIBLE 147
930+#define KVM_CAP_HYPERV_SYNIC2 148
931+#define KVM_CAP_HYPERV_VP_INDEX 149
930932
931933 #ifdef KVM_CAP_IRQ_ROUTING
932934
@@ -1351,7 +1353,7 @@ struct kvm_s390_ucas_mapping { · 418 unmodified lines
13511353 /* Available with KVM_CAP_X86_SMM */
13521354 #define KVM_SMI _IO(KVMIO, 0xb7)
13531355 /* Available with KVM_CAP_S390_CMMA_MIGRATION */
1354−#define KVM_S390_GET_CMMA_BITS _IOW(KVMIO, 0xb8, struct kvm_s390_cmma_log)
1356+#define KVM_S390_GET_CMMA_BITS _IOWR(KVMIO, 0xb8, struct kvm_s390_cmma_log)
13551357 #define KVM_S390_SET_CMMA_BITS _IOW(KVMIO, 0xb9, struct kvm_s390_cmma_log)
13561358
13571359 #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)