[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/7] arm_kvm: Do not assume particular GIC type in kv
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 3/7] arm_kvm: Do not assume particular GIC type in kvm_arch_irqchip_create() |
Date: |
Wed, 23 Sep 2015 22:43:05 +0100 |
From: Pavel Fedin <address@hidden>
This allows us to use different GIC types from v2. There are no kernels
which could advertise KVM_CAP_DEVICE_CTRL without the actual ability to
create GIC with it.
GIC version probe code moved to kvm_arm_vgic_probe() which will be used
later.
Signed-off-by: Pavel Fedin <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Tested-by: Ashok kumar <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/kvm.c | 19 ++++++++++++-------
target-arm/kvm_arm.h | 9 +++++++++
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index b278542..6aadcd8 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -585,18 +585,23 @@ void kvm_arch_init_irq_routing(KVMState *s)
int kvm_arch_irqchip_create(KVMState *s)
{
- int ret;
-
/* If we can create the VGIC using the newer device control API, we
* let the device do this when it initializes itself, otherwise we
* fall back to the old API */
+ return kvm_check_extension(s, KVM_CAP_DEVICE_CTRL);
+}
- ret = kvm_create_device(s, KVM_DEV_TYPE_ARM_VGIC_V2, true);
- if (ret == 0) {
- return 1;
+int kvm_arm_vgic_probe(void)
+{
+ if (kvm_create_device(kvm_state,
+ KVM_DEV_TYPE_ARM_VGIC_V3, true) == 0) {
+ return 3;
+ } else if (kvm_create_device(kvm_state,
+ KVM_DEV_TYPE_ARM_VGIC_V2, true) == 0) {
+ return 2;
+ } else {
+ return 0;
}
-
- return 0;
}
int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
diff --git a/target-arm/kvm_arm.h b/target-arm/kvm_arm.h
index b3e0ab7..10ce771 100644
--- a/target-arm/kvm_arm.h
+++ b/target-arm/kvm_arm.h
@@ -189,6 +189,15 @@ int kvm_arm_sync_mpstate_to_kvm(ARMCPU *cpu);
*/
int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu);
+int kvm_arm_vgic_probe(void);
+
+#else
+
+static inline int kvm_arm_vgic_probe(void)
+{
+ return 0;
+}
+
#endif
static inline const char *gic_class_name(void)
--
1.9.1
- [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2015/09/23
- [Qemu-devel] [PULL 7/7] MAINTAINERS: update Allwinner A10 maintainer, Peter Maydell, 2015/09/23
- [Qemu-devel] [PULL 6/7] hw/arm/virt-acpi-build: Fix wrong size of flash in ACPI table, Peter Maydell, 2015/09/23
- [Qemu-devel] [PULL 1/7] hw/intc: Implement GIC-500 base class, Peter Maydell, 2015/09/23
- [Qemu-devel] [PULL 3/7] arm_kvm: Do not assume particular GIC type in kvm_arch_irqchip_create(),
Peter Maydell <=
- [Qemu-devel] [PULL 4/7] hw/intc: Initial implementation of vGICv3, Peter Maydell, 2015/09/23
- [Qemu-devel] [PULL 5/7] hw/arm/virt: Add gic-version option to virt machine, Peter Maydell, 2015/09/23
- [Qemu-devel] [PULL 2/7] intc/gic: Extract some reusable vGIC code, Peter Maydell, 2015/09/23
- Re: [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2015/09/23