History

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

Pull kvm updates from Paolo Bonzini: "ARM: - Move the arch-specific code into arch/arm64/kvm - Start the post-32bit cleanup - Cherry-pick a few non-invasive pre-NV patches x86: - Rework of TLB flushing - Rework of event injection, especially with respect to nested virtualization - Nested AMD event injection facelift, building on the rework of generic code and fixing a lot of corner cases - Nested AMD live migration support - Optimization for TSC deadline MSR writes and IPIs - Various cleanups - Asynchronous page fault cleanups (from tglx, common topic branch with tip tree) - Interrupt-based delivery of asynchronous "page ready" events (host side) - Hyper-V MSRs and hypercalls for guest debugging - VMX preemption timer fixes s390: - Cleanups Generic: - switch vCPU thread wakeup from swait to rcuwait The other architectures, and the guest side of the asynchronous page fault work, will come next week" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (256 commits) KVM: selftests: fix rdtsc() for vmx_tsc_adjust_test KVM: check userspace_addr for all memslots KVM: selftests: update hyperv_cpuid with SynDBG tests x86/kvm/hyper-v: Add support for synthetic debugger via hypercalls x86/kvm/hyper-v: enable hypercalls regardless of hypercall page x86/kvm/hyper-v: Add support for synthetic debugger interface x86/hyper-v: Add synthetic debugger definitions KVM: selftests: VMX preemption timer migration test KVM: nVMX: Fix VMX preemption timer migration x86/kvm/hyper-v: Explicitly align hcall param for kvm_hyperv_exit KVM: x86/pmu: Support full width counting KVM: x86/pmu: Tweak kvm_pmu_get_msr to pass 'struct msr_data' in KVM: x86: announce KVM_FEATURE_ASYNC_PF_INT KVM: x86: acknowledgment mechanism for async pf page ready notifications KVM: x86: interrupt based APF 'page ready' event delivery KVM: introduce kvm_read_guest_offset_cached() KVM: rename kvm_arch_can_inject_async_page_present() to kvm_arch_can_dequeue_async_page_present() KVM: x86: extend struct kvm_vcpu_pv_apf_data with token info Revert "KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously" KVM: VMX: Replace zero-length array with flexible-array ...

Linus Torvalds committed 6 years ago

Commit 039aeb92 parents 6b2591c 13ffbd8155 files · +5309 −3048Browse files

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

Unified · Split

include/uapi/linux/kvm.h+14−0
@@ -188,10 +188,13 @@ struct kvm_s390_cmma_log { · 187 unmodified lines
188struct kvm_hyperv_exit {188struct kvm_hyperv_exit {
189#define KVM_EXIT_HYPERV_SYNIC 1189#define KVM_EXIT_HYPERV_SYNIC 1
190#define KVM_EXIT_HYPERV_HCALL 2190#define KVM_EXIT_HYPERV_HCALL 2
191#define KVM_EXIT_HYPERV_SYNDBG 3
191 __u32 type;192 __u32 type;
193 __u32 pad1;
192 union {194 union {
193 struct {195 struct {
194 __u32 msr;196 __u32 msr;
197 __u32 pad2;
195 __u64 control;198 __u64 control;
196 __u64 evt_page;199 __u64 evt_page;
197 __u64 msg_page;200 __u64 msg_page;
@@ -201,6 +204,15 @@ struct kvm_hyperv_exit { · 3 unmodified lines
201 __u64 result;204 __u64 result;
202 __u64 params[2];205 __u64 params[2];
203 } hcall;206 } hcall;
207 struct {
208 __u32 msr;
209 __u32 pad2;
210 __u64 control;
211 __u64 status;
212 __u64 send_page;
213 __u64 recv_page;
214 __u64 pending_page;
215 } syndbg;
204 } u;216 } u;
205};217};
206 218
@@ -1017,6 +1029,8 @@ struct kvm_ppc_resize_hpt { · 810 unmodified lines
1017#define KVM_CAP_S390_VCPU_RESETS 1791029#define KVM_CAP_S390_VCPU_RESETS 179
1018#define KVM_CAP_S390_PROTECTED 1801030#define KVM_CAP_S390_PROTECTED 180
1019#define KVM_CAP_PPC_SECURE_GUEST 1811031#define KVM_CAP_PPC_SECURE_GUEST 181
1032#define KVM_CAP_HALT_POLL 182
1033#define KVM_CAP_ASYNC_PF_INT 183
1020 1034
1021#ifdef KVM_CAP_IRQ_ROUTING1035#ifdef KVM_CAP_IRQ_ROUTING
1022 1036

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