diff options
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/boot.c | 6 | ||||
| -rw-r--r-- | hw/arm/vexpress.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index cce8c7c..0a56d34c 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -437,8 +437,10 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, return 0; } - acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); - scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); if (acells == 0 || scells == 0) { fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); goto fail; diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 3154aea..726c4e0 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -478,8 +478,10 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt) uint32_t acells, scells, intc; const VEDBoardInfo *daughterboard = (const VEDBoardInfo *)info; - acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); - scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); intc = find_int_controller(fdt); if (!intc) { /* Not fatal, we just won't provide virtio. This will |