summaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/hw/loader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/loader.h b/include/hw/loader.h
index 58eca9832b..7a23d6bdc1 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -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