replace error_setg(&error_fatal, ...) with error_report()
According to include/qapi/error.h: * Please don't error_setg(&error_fatal, ...), use error_report() and * exit(), because that's more obvious. Patch updates all instances of error_setg(&error_fatal, ...) with error_report(...), adds the explicit exit(1) and removes redundant return statements. Signed-off-by: Tudor Gheorghiu <tudor.reda@gmail.com> Suggested-by: Thomas Huth <thuth@redhat.com> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2587 Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> (Mjt: also fold __func__ to previous line)
This commit is contained in:
parent
f8d3116fdd
commit
5ae3ec6363
@ -17,6 +17,7 @@
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/module.h"
|
||||
#include "hw/char/serial-mm.h"
|
||||
#include "hw/sysbus.h"
|
||||
@ -50,9 +51,8 @@ void allwinner_a10_bootrom_setup(AwA10State *s, BlockBackend *blk)
|
||||
g_autofree uint8_t *buffer = g_new0(uint8_t, rom_size);
|
||||
|
||||
if (blk_pread(blk, 8 * KiB, rom_size, buffer, 0) < 0) {
|
||||
error_setg(&error_fatal, "%s: failed to read BlockBackend data",
|
||||
__func__);
|
||||
return;
|
||||
error_report("%s: failed to read BlockBackend data", __func__);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
rom_add_blob("allwinner-a10.bootrom", buffer, rom_size,
|
||||
|
@ -182,9 +182,8 @@ void allwinner_h3_bootrom_setup(AwH3State *s, BlockBackend *blk)
|
||||
g_autofree uint8_t *buffer = g_new0(uint8_t, rom_size);
|
||||
|
||||
if (blk_pread(blk, 8 * KiB, rom_size, buffer, 0) < 0) {
|
||||
error_setg(&error_fatal, "%s: failed to read BlockBackend data",
|
||||
__func__);
|
||||
return;
|
||||
error_report("%s: failed to read BlockBackend data", __func__);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
rom_add_blob("allwinner-h3.bootrom", buffer, rom_size,
|
||||
|
@ -231,9 +231,8 @@ bool allwinner_r40_bootrom_setup(AwR40State *s, BlockBackend *blk, int unit)
|
||||
struct boot_file_head *head = (struct boot_file_head *)buffer;
|
||||
|
||||
if (blk_pread(blk, 8 * KiB, rom_size, buffer, 0) < 0) {
|
||||
error_setg(&error_fatal, "%s: failed to read BlockBackend data",
|
||||
__func__);
|
||||
return false;
|
||||
error_report("%s: failed to read BlockBackend data", __func__);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* we only check the magic string here. */
|
||||
|
@ -761,9 +761,9 @@ static void versal_virt_init(MachineState *machine)
|
||||
if (!flash_klass ||
|
||||
object_class_is_abstract(flash_klass) ||
|
||||
!object_class_dynamic_cast(flash_klass, TYPE_M25P80)) {
|
||||
error_setg(&error_fatal, "'%s' is either abstract or"
|
||||
error_report("'%s' is either abstract or"
|
||||
" not a subtype of m25p80", s->ospi_model);
|
||||
return;
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,8 @@ void select_soundhw(const char *name, const char *audiodev)
|
||||
struct soundhw *c;
|
||||
|
||||
if (selected) {
|
||||
error_setg(&error_fatal, "only one -soundhw option is allowed");
|
||||
error_report("only one -soundhw option is allowed");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
for (c = soundhw; c->name; ++c) {
|
||||
|
@ -1841,7 +1841,8 @@ static void object_option_parse(const char *str)
|
||||
|
||||
type = qemu_opt_get(opts, "qom-type");
|
||||
if (!type) {
|
||||
error_setg(&error_fatal, QERR_MISSING_PARAMETER, "qom-type");
|
||||
error_report(QERR_MISSING_PARAMETER, "qom-type");
|
||||
exit(1);
|
||||
}
|
||||
if (user_creatable_print_help(type, opts)) {
|
||||
exit(0);
|
||||
|
Loading…
Reference in New Issue
Block a user