History

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

Pull more KVM updates from Paolo Bonzini: - ARM bugfix and MSI injection support - x86 nested virt tweak and OOPS fix - Simplify pvclock code (vdso bits acked by Andy Lutomirski). * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: nvmx: mark ept single context invalidation as supported nvmx: remove comment about missing nested vpid support KVM: lapic: fix access preemption timer stuff even if kernel_irqchip=off KVM: documentation: fix KVM_CAP_X2APIC_API information x86: vdso: use __pvclock_read_cycles pvclock: introduce seqcount-like API arm64: KVM: Set cpsr before spsr on fault injection KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype KVM: arm/arm64: Enable MSI routing KVM: arm/arm64: Enable irqchip routing KVM: Move kvm_setup_default/empty_irq_routing declaration in arch specific header KVM: irqchip: Convey devid to kvm_set_msi KVM: Add devid in kvm_kernel_irq_routing_entry KVM: api: Pass the devid in the msi routing entry

Linus Torvalds committed 10 years ago

Commit 80fac0f2 parents 4305f42 45e118121 files · +273 −117Browse files

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

Unified · Split

include/uapi/linux/kvm.h+4−1
@@ -882,7 +882,10 @@ struct kvm_irq_routing_msi { · 881 unmodified lines
882 __u32 address_lo;882 __u32 address_lo;
883 __u32 address_hi;883 __u32 address_hi;
884 __u32 data;884 __u32 data;
885 __u32 pad;885 union {
886 __u32 pad;
887 __u32 devid;
888 };
886};889};
887 890
888struct kvm_irq_routing_s390_adapter {891struct kvm_irq_routing_s390_adapter {

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