Instantiate "kvm-arm-gicv3" class for GICv3 with KVM acceleration

Signed-off-by: Pavel Fedin <[email protected]>
---
 hw/arm/virt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 5c07d07..100cb17 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -410,11 +410,9 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic, 
int type)
     int i;
 
     if (type == KVM_DEV_TYPE_ARM_VGIC_V3) {
-        gictype = "arm_gicv3";
-    } else if (kvm_irqchip_in_kernel()) {
-        gictype = "kvm-arm-gic";
+        gictype = kvm_irqchip_in_kernel() ? "kvm-arm-gicv3" : "arm_gicv3";
     } else {
-        gictype = "arm_gic";
+        gictype = kvm_irqchip_in_kernel() ? "kvm-arm-gic" : "arm_gic";
     }
 
     gicdev = qdev_create(NULL, gictype);
-- 
1.9.5.msysgit.0


Reply via email to