* 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: KVM: ARM: Add maintainer entry for KVM/ARM KVM: ARM: Power State Coordination Interface implementation KVM: ARM: Handle I/O aborts KVM: ARM: Handle guest faults in KVM KVM: ARM: VFP userspace interface KVM: ARM: Demux CCSIDR in the userspace API KVM: ARM: User space API for getting/setting co-proc registers KVM: ARM: Emulation framework and CP15 emulation KVM: ARM: World-switch implementation KVM: ARM: Inject IRQs and FIQs from userspace KVM: ARM: Memory virtualization setup KVM: ARM: Hypervisor initialization KVM: ARM: Initial skeleton to compile KVM support ARM: Section based HYP idmap ARM: Add page table and page defines needed by KVM
Showing the changes to include/uapi (1 of 38 files). Show all
Unified · Split
| @@ -115,6 +115,7 @@ struct kvm_irq_level { · 114 unmodified lines | ||
| 115 | 115 | * ACPI gsi notion of irq. |
| 116 | 116 | * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47.. |
| 117 | 117 | * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23.. |
| 118 | + * For ARM: See Documentation/virtual/kvm/api.txt | |
| 118 | 119 | */ |
| 119 | 120 | union { |
| 120 | 121 | __u32 irq; |
| @@ -635,6 +636,7 @@ struct kvm_ppc_smmu_info { · 514 unmodified lines | ||
| 635 | 636 | #define KVM_CAP_IRQFD_RESAMPLE 82 |
| 636 | 637 | #define KVM_CAP_PPC_BOOKE_WATCHDOG 83 |
| 637 | 638 | #define KVM_CAP_PPC_HTAB_FD 84 |
| 639 | +#define KVM_CAP_ARM_PSCI 87 | |
| 638 | 640 | |
| 639 | 641 | #ifdef KVM_CAP_IRQ_ROUTING |
| 640 | 642 | |
| @@ -764,6 +766,11 @@ struct kvm_dirty_tlb { · 123 unmodified lines | ||
| 764 | 766 | #define KVM_REG_SIZE_U512 0x0060000000000000ULL |
| 765 | 767 | #define KVM_REG_SIZE_U1024 0x0070000000000000ULL |
| 766 | 768 | |
| 769 | +struct kvm_reg_list { | |
| 770 | + __u64 n; /* number of regs */ | |
| 771 | + __u64 reg[0]; | |
| 772 | +}; | |
| 773 | + | |
| 767 | 774 | struct kvm_one_reg { |
| 768 | 775 | __u64 id; |
| 769 | 776 | __u64 addr; |
| @@ -932,6 +939,8 @@ struct kvm_s390_ucas_mapping { · 162 unmodified lines | ||
| 932 | 939 | #define KVM_SET_ONE_REG _IOW(KVMIO, 0xac, struct kvm_one_reg) |
| 933 | 940 | /* VM is being stopped by host */ |
| 934 | 941 | #define KVM_KVMCLOCK_CTRL _IO(KVMIO, 0xad) |
| 942 | +#define KVM_ARM_VCPU_INIT _IOW(KVMIO, 0xae, struct kvm_vcpu_init) | |
| 943 | +#define KVM_GET_REG_LIST _IOWR(KVMIO, 0xb0, struct kvm_reg_list) | |
| 935 | 944 | |
| 936 | 945 | #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) |
| 937 | 946 | #define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) |