diff options
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/iotkit.c | 2 | ||||
| -rw-r--r-- | hw/arm/smmuv3.c | 1 | ||||
| -rw-r--r-- | hw/arm/sysbus-fdt.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c index c76d3ed743..8cadc8b160 100644 --- a/hw/arm/iotkit.c +++ b/hw/arm/iotkit.c @@ -382,7 +382,7 @@ static void iotkit_realize(DeviceState *dev, Error **errp) return; } sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0, - qdev_get_gpio_in(DEVICE(&s->armv7m), 3)); + qdev_get_gpio_in(DEVICE(&s->armv7m), 4)); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err); if (err) { diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 39fbcbf577..bb6a24e9b8 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -1414,6 +1414,7 @@ static const VMStateDescription vmstate_smmuv3_queue = { VMSTATE_UINT32(prod, SMMUQueue), VMSTATE_UINT32(cons, SMMUQueue), VMSTATE_UINT8(log2size, SMMUQueue), + VMSTATE_END_OF_LIST(), }, }; diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 0d4c75702c..43d6a7bb48 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -107,6 +107,7 @@ static void copy_properties_from_host(HostProperty *props, int nb_props, /* mandatory property not found: bail out */ exit(1); } + err = NULL; } } } |