diff options
Diffstat (limited to 'hw/a15mpcore.c')
| -rw-r--r-- | hw/a15mpcore.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/a15mpcore.c b/hw/a15mpcore.c index 31158f9..97abe41 100644 --- a/hw/a15mpcore.c +++ b/hw/a15mpcore.c @@ -19,7 +19,7 @@ */ #include "sysbus.h" -#include "kvm.h" +#include "sysemu/kvm.h" /* A15MP private memory region. */ @@ -41,7 +41,7 @@ static int a15mp_priv_init(SysBusDevice *dev) { A15MPPrivState *s = FROM_SYSBUS(A15MPPrivState, dev); SysBusDevice *busdev; - const char *gictype = "arm-gic"; + const char *gictype = "arm_gic"; if (kvm_irqchip_in_kernel()) { gictype = "kvm-arm-gic"; @@ -52,7 +52,7 @@ static int a15mp_priv_init(SysBusDevice *dev) qdev_prop_set_uint32(s->gic, "num-irq", s->num_irq); qdev_prop_set_uint32(s->gic, "revision", 2); qdev_init_nofail(s->gic); - busdev = sysbus_from_qdev(s->gic); + busdev = SYS_BUS_DEVICE(s->gic); /* Pass through outbound IRQ lines from the GIC */ sysbus_pass_irq(dev, busdev); @@ -99,7 +99,7 @@ static void a15mp_priv_class_init(ObjectClass *klass, void *data) /* We currently have no savable state */ } -static TypeInfo a15mp_priv_info = { +static const TypeInfo a15mp_priv_info = { .name = "a15mpcore_priv", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(A15MPPrivState), |