summaryrefslogtreecommitdiff
path: root/hw/ppc
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-11-10 11:53:30 +0200
committerMichael S. Tsirkin <mst@redhat.com>2013-11-10 12:08:38 +0200
commitfe1479aa251971abd3842dee4a783d4ebace8fb8 (patch)
tree686a35a74678d538d40b35b4de739d883c82f821 /hw/ppc
parent81adc5131534ca7554cebe64cd8f86bac28dbd1b (diff)
downloadqemu-fe1479aa251971abd3842dee4a783d4ebace8fb8.tar.gz
loader: drop return value for rom_add_blob_fixed
rom_add_blob never fails, and neither does rom_add_blob_fixed, so there's no need to return value from it. In fact, rom_add_blob_fixed was erroneously returning -1 unconditionally which made the only system that checked the return value -M bamboo fail to start. Drop the return value and drop checks from ppc440_bamboo to fix this failure. Reported-by: Alexander Graf <agraf@suse.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/ppc')
-rw-r--r--hw/ppc/ppc440_bamboo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 655e49906d..67597dfb88 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -110,8 +110,9 @@ static int bamboo_load_device_tree(hwaddr addr,
qemu_devtree_setprop_cell(fdt, "/cpus/cpu@0", "timebase-frequency",
tb_freq);
- ret = rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);
+ rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);
g_free(fdt);
+ return 0;
out: