ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check 

qemu_fdt_setprop asserts in case of error hence no need to check
the returned value.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Eric Auger 2016-02-19 09:42:31 -07:00 committed by Alex Williamson
parent cf5a13e370
commit c89e91a76b
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/arm/sysbus-fdt.c
View File

@ -217,7 +217,7 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque)
PlatformBusDevice *pbus = data->pbus; PlatformBusDevice *pbus = data->pbus;
void *fdt = data->fdt; void *fdt = data->fdt;
const char *parent_node = data->pbus_node_name; const char *parent_node = data->pbus_node_name;
int compat_str_len, i, ret = -1; int compat_str_len, i;
char *nodename; char *nodename;
uint32_t *irq_attr, *reg_attr; uint32_t *irq_attr, *reg_attr;
uint64_t mmio_base, irq_number; uint64_t mmio_base, irq_number;
@ -242,12 +242,8 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque)
reg_attr[2 * i + 1] = cpu_to_be32( reg_attr[2 * i + 1] = cpu_to_be32(
memory_region_size(&vdev->regions[i]->mem)); memory_region_size(&vdev->regions[i]->mem));
} }
ret = qemu_fdt_setprop(fdt, nodename, "reg", reg_attr, qemu_fdt_setprop(fdt, nodename, "reg", reg_attr,
vbasedev->num_regions * 2 * sizeof(uint32_t)); vbasedev->num_regions * 2 * sizeof(uint32_t));
if (ret) {
error_report("could not set reg property of node %s", nodename);
goto fail_reg;
}
irq_attr = g_new(uint32_t, vbasedev->num_irqs * 3); irq_attr = g_new(uint32_t, vbasedev->num_irqs * 3);
for (i = 0; i < vbasedev->num_irqs; i++) { for (i = 0; i < vbasedev->num_irqs; i++) {
@ -257,17 +253,12 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque)
irq_attr[3 * i + 1] = cpu_to_be32(irq_number); irq_attr[3 * i + 1] = cpu_to_be32(irq_number);
irq_attr[3 * i + 2] = cpu_to_be32(GIC_FDT_IRQ_FLAGS_LEVEL_HI); irq_attr[3 * i + 2] = cpu_to_be32(GIC_FDT_IRQ_FLAGS_LEVEL_HI);
} }
ret = qemu_fdt_setprop(fdt, nodename, "interrupts", qemu_fdt_setprop(fdt, nodename, "interrupts",
irq_attr, vbasedev->num_irqs * 3 * sizeof(uint32_t)); irq_attr, vbasedev->num_irqs * 3 * sizeof(uint32_t));
if (ret) {
error_report("could not set interrupts property of node %s",
nodename);
}
g_free(irq_attr); g_free(irq_attr);
fail_reg:
g_free(reg_attr); g_free(reg_attr);
g_free(nodename); g_free(nodename);
return ret; return 0;
} }
/* AMD xgbe properties whose values are copied/pasted from host */ /* AMD xgbe properties whose values are copied/pasted from host */