[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 5/8] linux-headers: update with VGIC related header
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [RFC v3 5/8] linux-headers: update with VGIC related headers (not for upstream) |
Date: |
Tue, 23 Oct 2012 11:50:25 +0100 |
This updates the headers to match Christoffer's
kvm-arm-v13-vgic-timers branch (commit e1414f8),
which adds the VGIC related ioctls/definitions.
---
linux-headers/asm-arm/kvm.h | 13 +++++++++++++
linux-headers/linux/kvm.h | 8 ++++++++
2 files changed, 21 insertions(+)
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
index fb41608..a7ae073 100644
--- a/linux-headers/asm-arm/kvm.h
+++ b/linux-headers/asm-arm/kvm.h
@@ -42,6 +42,19 @@ struct kvm_regs {
#define KVM_ARM_TARGET_CORTEX_A15 0
#define KVM_ARM_NUM_TARGETS 1
+/* KVM_SET_DEVICE_ADDRESS ioctl id encoding */
+#define KVM_DEVICE_TYPE_SHIFT 0
+#define KVM_DEVICE_TYPE_MASK (0xffff << KVM_DEVICE_TYPE_SHIFT)
+#define KVM_DEVICE_ID_SHIFT 16
+#define KVM_DEVICE_ID_MASK (0xffff << KVM_DEVICE_ID_SHIFT)
+
+/* Supported device IDs */
+#define KVM_ARM_DEVICE_VGIC_V2 0
+
+/* Supported VGIC address types */
+#define KVM_VGIC_V2_ADDR_TYPE_DIST 0
+#define KVM_VGIC_V2_ADDR_TYPE_CPU 1
+
struct kvm_vcpu_init {
__u32 target;
__u32 features[7];
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 4f309db..60ee3a0 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -631,6 +631,7 @@ struct kvm_ppc_smmu_info {
#endif
#define KVM_CAP_IRQFD_RESAMPLE 82
#define KVM_CAP_PPC_BOOKE_WATCHDOG 83
+#define KVM_CAP_SET_DEVICE_ADDR 84
#ifdef KVM_CAP_IRQ_ROUTING
@@ -778,6 +779,11 @@ struct kvm_msi {
__u8 pad[16];
};
+struct kvm_device_address {
+ __u32 id;
+ __u64 addr;
+};
+
/*
* ioctls for VM fds
*/
@@ -861,6 +867,8 @@ struct kvm_s390_ucas_mapping {
#define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct
kvm_create_spapr_tce)
/* Available with KVM_CAP_RMA */
#define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma)
+/* Available with KVM_CAP_SET_DEVICE_ADDR */
+#define KVM_SET_DEVICE_ADDRESS _IOW(KVMIO, 0xaa, struct kvm_device_address)
/*
* ioctls for vcpu fds
--
1.7.9.5
- [Qemu-devel] [RFC v3 0/8] QEMU: Support KVM on ARM, Peter Maydell, 2012/10/23
- [Qemu-devel] [RFC v3 5/8] linux-headers: update with VGIC related headers (not for upstream),
Peter Maydell <=
- [Qemu-devel] [RFC v3 4/8] hw/arm_gic: Add presave/postload hooks, Peter Maydell, 2012/10/23
- [Qemu-devel] [RFC v3 1/8] linux-headers: Add ARM KVM headers (not for upstream), Peter Maydell, 2012/10/23
- [Qemu-devel] [RFC v3 6/8] target-arm: Use MemoryListener to identify GIC base address for KVM, Peter Maydell, 2012/10/23
- [Qemu-devel] [RFC v3 8/8] configure: Enable KVM on ARM, Peter Maydell, 2012/10/23
- [Qemu-devel] [RFC v3 2/8] ARM: KVM: Add support for KVM on ARM architecture, Peter Maydell, 2012/10/23
- [Qemu-devel] [RFC v3 3/8] ARM KVM: save and load VFP registers from kernel, Peter Maydell, 2012/10/23
- [Qemu-devel] [RFC v3 7/8] hw/kvm/arm_gic: Implement support for KVM in-kernel ARM GIC, Peter Maydell, 2012/10/23