Commit fe1479aa authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

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: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 81adc513

hw/ppc/ppc440_bamboo.c

+2 −1
Original line number Diff line number Diff line
@@ -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:

include/hw/loader.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void do_info_roms(Monitor *mon, const QDict *qdict); 
#define rom_add_file_fixed(_f, _a, _i)          \

    rom_add_file(_f, NULL, _a, _i)

#define rom_add_blob_fixed(_f, _b, _l, _a)      \

    (rom_add_blob(_f, _b, _l, _a, NULL, NULL, NULL) ? 0 : -1)

    rom_add_blob(_f, _b, _l, _a, NULL, NULL, NULL)



#define PC_ROM_MIN_VGA     0xc0000

#define PC_ROM_MIN_OPTION  0xc8000