History

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

Pull KVM changes from Paolo Bonzini: "These are the x86, MIPS and s390 changes; PPC and ARM will come in a few days. MIPS and s390 have little going on this release; just bugfixes, some small, some larger. The highlights for x86 are nested VMX improvements (Jan Kiszka), optimizations for old processor (up to Nehalem, by me and Bandan Das), and a lot of x86 emulator bugfixes (Nadav Amit). Stephen Rothwell reported a trivial conflict with the tracing branch" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (104 commits) x86/kvm: Resolve shadow warnings in macro expansion KVM: s390: rework broken SIGP STOP interrupt handling KVM: x86: always exit on EOIs for interrupts listed in the IOAPIC redir table KVM: vmx: remove duplicate vmx_mpx_supported() prototype KVM: s390: Fix memory leak on busy SIGP stop x86/kvm: Resolve shadow warning from min macro kvm: Resolve missing-field-initializers warnings Replace NR_VMX_MSR with its definition KVM: x86: Assertions to check no overrun in MSR lists KVM: x86: set rflags.rf during fault injection KVM: x86: Setting rflags.rf during rep-string emulation KVM: x86: DR6/7.RTM cannot be written KVM: nVMX: clean up nested_release_vmcs12 and code around it KVM: nVMX: fix lifetime issues for vmcs02 KVM: x86: Defining missing x86 vectors KVM: x86: emulator injects #DB when RFLAGS.RF is set KVM: x86: Cleanup of rflags.rf cleaning KVM: x86: Clear rflags.rf on emulated instructions KVM: x86: popf emulation should not change RF KVM: x86: Clearing rflags.rf upon skipped emulated instruction ...

Linus Torvalds committed 12 years ago

Commit 8533ce72 parents c9b88e9 42cbc0447 files · +1790 −1444Browse files

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

Unified · Split

include/uapi/linux/kvm.h+6−1
@@ -399,13 +399,18 @@ struct kvm_vapic_addr { · 398 unmodified lines
399399 __u64 vapic_addr;
400400 };
401401
402−/* for KVM_SET_MPSTATE */
402+/* for KVM_SET_MP_STATE */
403403
404+/* not all states are valid on all architectures */
404405 #define KVM_MP_STATE_RUNNABLE 0
405406 #define KVM_MP_STATE_UNINITIALIZED 1
406407 #define KVM_MP_STATE_INIT_RECEIVED 2
407408 #define KVM_MP_STATE_HALTED 3
408409 #define KVM_MP_STATE_SIPI_RECEIVED 4
410+#define KVM_MP_STATE_STOPPED 5
411+#define KVM_MP_STATE_CHECK_STOP 6
412+#define KVM_MP_STATE_OPERATING 7
413+#define KVM_MP_STATE_LOAD 8
409414
410415 struct kvm_mp_state {
411416 __u32 mp_state;