History

Merge tag 'kvm-4.3-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull kvm updates from Paolo Bonzini: "A very small release for x86 and s390 KVM. - s390: timekeeping changes, cleanups and fixes - x86: support for Hyper-V MSRs to report crashes, and a bunch of cleanups. One interesting feature that was planned for 4.3 (emulating the local APIC in kernel while keeping the IOAPIC and 8254 in userspace) had to be delayed because Intel complained about my reading of the manual" * tag 'kvm-4.3-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (42 commits) x86/kvm: Rename VMX's segment access rights defines KVM: x86/vPMU: Fix unnecessary signed extension for AMD PERFCTRn kvm: x86: Fix error handling in the function kvm_lapic_sync_from_vapic KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully KVM: VMX: drop ept misconfig check KVM: MMU: fully check zero bits for sptes KVM: MMU: introduce is_shadow_zero_bits_set() KVM: MMU: introduce the framework to check zero bits on sptes KVM: MMU: split reset_rsvds_bits_mask_ept KVM: MMU: split reset_rsvds_bits_mask KVM: MMU: introduce rsvd_bits_validate KVM: MMU: move FNAME(is_rsvd_bits_set) to mmu.c KVM: MMU: fix validation of mmio page fault KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON KVM: s390: host STP toleration for VMs KVM: x86: clean/fix memory barriers in irqchip_in_kernel KVM: document memory barriers for kvm->vcpus/kvm->online_vcpus KVM: x86: remove unnecessary memory barriers for shared MSRs KVM: move code related to KVM_SET_BOOT_CPU_ID to x86 KVM: s390: log capability enablement and vm attribute changes ...

Linus Torvalds committed 11 years ago

Commit 44e98ed2 parents 64291f7 4d283ec35 files · +1084 −825Browse files

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

Unified · Split

include/uapi/linux/kvm.h+2−0
@@ -317,6 +317,7 @@ struct kvm_run { · 316 unmodified lines
317317 struct {
318318 #define KVM_SYSTEM_EVENT_SHUTDOWN 1
319319 #define KVM_SYSTEM_EVENT_RESET 2
320+#define KVM_SYSTEM_EVENT_CRASH 3
320321 __u32 type;
321322 __u64 flags;
322323 } system_event;
@@ -481,6 +482,7 @@ struct kvm_s390_psw { · 158 unmodified lines
481482 ((ai) << 26))
482483 #define KVM_S390_INT_IO_MIN 0x00000000u
483484 #define KVM_S390_INT_IO_MAX 0xfffdffffu
485+#define KVM_S390_INT_IO_AI_MASK 0x04000000u
484486
485487
486488 struct kvm_s390_interrupt {