aboutsummaryrefslogtreecommitdiff
path: root/hw/a15mpcore.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/a15mpcore.c')
-rw-r--r--hw/a15mpcore.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/a15mpcore.c b/hw/a15mpcore.c
index e075849..31158f9 100644
--- a/hw/a15mpcore.c
+++ b/hw/a15mpcore.c
@@ -41,16 +41,13 @@ static int a15mp_priv_init(SysBusDevice *dev)
{
A15MPPrivState *s = FROM_SYSBUS(A15MPPrivState, dev);
SysBusDevice *busdev;
+ const char *gictype = "arm-gic";
- /* TODO when the VGIC patches make it to Christoffer's kernel
- * tree we can make !kvm_irqchip_in_kernel() a fatal error.
- */
if (kvm_irqchip_in_kernel()) {
- s->gic = qdev_create(NULL, "kvm-arm_gic");
- } else {
- s->gic = qdev_create(NULL, "arm_gic");
+ gictype = "kvm-arm-gic";
}
+ s->gic = qdev_create(NULL, gictype);
qdev_prop_set_uint32(s->gic, "num-cpu", s->num_cpu);
qdev_prop_set_uint32(s->gic, "num-irq", s->num_irq);
qdev_prop_set_uint32(s->gic, "revision", 2);