History

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

Pull second round of KVM changes from Paolo Bonzini: "Here are the PPC and ARM changes for KVM, which I separated because they had small conflicts (respectively within KVM documentation, and with 3.16-rc changes). Since they were all within the subsystem, I took care of them. Stephen Rothwell reported some snags in PPC builds, but they are all fixed now; the latest linux-next report was clean. New features for ARM include: - KVM VGIC v2 emulation on GICv3 hardware - Big-Endian support for arm/arm64 (guest and host) - Debug Architecture support for arm64 (arm32 is on Christoffer's todo list) And for PPC: - Book3S: Good number of LE host fixes, enable HV on LE - Book3S HV: Add in-guest debug support This release drops support for KVM on the PPC440. As a result, the PPC merge removes more lines than it adds. :) I also included an x86 change, since Davidlohr tied it to an independent bug report and the reporter quickly provided a Tested-by; there was no reason to wait for -rc2" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (122 commits) KVM: Move more code under CONFIG_HAVE_KVM_IRQFD KVM: nVMX: fix "acknowledge interrupt on exit" when APICv is in use KVM: nVMX: Fix nested vmexit ack intr before load vmcs01 KVM: PPC: Enable IRQFD support for the XICS interrupt controller KVM: Give IRQFD its own separate enabling Kconfig option KVM: Move irq notifier implementation into eventfd.c KVM: Move all accesses to kvm::irq_routing into irqchip.c KVM: irqchip: Provide and use accessors for irq routing table KVM: Don't keep reference to irq routing table in irqfd struct KVM: PPC: drop duplicate tracepoint arm64: KVM: fix 64bit CP15 VM access for 32bit guests KVM: arm64: GICv3: mandate page-aligned GICV region arm64: KVM: GICv3: move system register access to msr_s/mrs_s KVM: PPC: PR: Handle FSCR feature deselects KVM: PPC: HV: Remove generic instruction emulation KVM: PPC: BOOKEHV: rename e500hv_spr to bookehv_spr KVM: PPC: Remove DCR handling KVM: PPC: Expose helper functions for data/inst faults KVM: PPC: Separate loadstore emulation from priv emulation KVM: PPC: Handle magic page in kvmppc_ld/st ...

Linus Torvalds committed 12 years ago

Commit 66bb0aa2 parents e306e3b c77dcac116 files · +5010 −2825Browse files

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

Unified · Split

include/uapi/linux/kvm.h+4−2
@@ -162,7 +162,7 @@ struct kvm_pit_config { · 161 unmodified lines
162#define KVM_EXIT_TPR_ACCESS 12162#define KVM_EXIT_TPR_ACCESS 12
163#define KVM_EXIT_S390_SIEIC 13163#define KVM_EXIT_S390_SIEIC 13
164#define KVM_EXIT_S390_RESET 14164#define KVM_EXIT_S390_RESET 14
165#define KVM_EXIT_DCR 15165#define KVM_EXIT_DCR 15 /* deprecated */
166#define KVM_EXIT_NMI 16166#define KVM_EXIT_NMI 16
167#define KVM_EXIT_INTERNAL_ERROR 17167#define KVM_EXIT_INTERNAL_ERROR 17
168#define KVM_EXIT_OSI 18168#define KVM_EXIT_OSI 18
@@ -268,7 +268,7 @@ struct kvm_run { · 99 unmodified lines
268 __u64 trans_exc_code;268 __u64 trans_exc_code;
269 __u32 pgm_code;269 __u32 pgm_code;
270 } s390_ucontrol;270 } s390_ucontrol;
271 /* KVM_EXIT_DCR */271 /* KVM_EXIT_DCR (deprecated) */
272 struct {272 struct {
273 __u32 dcrn;273 __u32 dcrn;
274 __u32 data;274 __u32 data;
@@ -763,6 +763,8 @@ struct kvm_ppc_smmu_info { · 488 unmodified lines
763#define KVM_CAP_VM_ATTRIBUTES 101763#define KVM_CAP_VM_ATTRIBUTES 101
764#define KVM_CAP_ARM_PSCI_0_2 102764#define KVM_CAP_ARM_PSCI_0_2 102
765#define KVM_CAP_PPC_FIXUP_HCALL 103765#define KVM_CAP_PPC_FIXUP_HCALL 103
766#define KVM_CAP_PPC_ENABLE_HCALL 104
767#define KVM_CAP_CHECK_EXTENSION_VM 105
766 768
767#ifdef KVM_CAP_IRQ_ROUTING769#ifdef KVM_CAP_IRQ_ROUTING
768 770