error: Use error_fatal to simplify obvious fatal errors (again)
We did this with scripts/coccinelle/use-error_fatal.cocci before, in
commit 50beeb68094 and 007b06578ab. This commit cleans up rarer
variations that don't seem worth matching with Coccinelle.
Cc: Thomas Huth <thuth@redhat.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-2-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 8c863cf..1821c6f 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -711,7 +711,6 @@
void s390_ipl_prepare_cpu(S390CPU *cpu)
{
S390IPLState *ipl = get_ipl_device();
- Error *err = NULL;
cpu->env.psw.addr = ipl->start_addr;
cpu->env.psw.mask = IPL_PSW_MASK;
@@ -723,10 +722,7 @@
}
}
if (ipl->netboot) {
- if (load_netboot_image(&err) < 0) {
- error_report_err(err);
- exit(1);
- }
+ load_netboot_image(&error_fatal);
ipl->qipl.netboot_start_addr = cpu_to_be64(ipl->start_addr);
}
s390_ipl_set_boot_menu(ipl);
diff --git a/migration/migration.c b/migration/migration.c
index 041b845..b169943 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -188,8 +188,6 @@
void migration_object_init(void)
{
- Error *err = NULL;
-
/* This can only be called once. */
assert(!current_migration);
current_migration = MIGRATION_OBJ(object_new(TYPE_MIGRATION));
@@ -210,10 +208,7 @@
qemu_mutex_init(¤t_incoming->page_request_mutex);
current_incoming->page_requested = g_tree_new(page_request_addr_cmp);
- if (!migration_object_check(current_migration, &err)) {
- error_report_err(err);
- exit(1);
- }
+ migration_object_check(current_migration, &error_fatal);
blk_mig_init();
ram_mig_init();
diff --git a/qemu-img.c b/qemu-img.c
index 908fd0c..d77f3e7 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -5350,7 +5350,6 @@
{
const img_cmd_t *cmd;
const char *cmdname;
- Error *local_error = NULL;
int c;
static const struct option long_options[] = {
{"help", no_argument, 0, 'h'},
@@ -5368,10 +5367,7 @@
module_call_init(MODULE_INIT_TRACE);
qemu_init_exec_dir(argv[0]);
- if (qemu_init_main_loop(&local_error)) {
- error_report_err(local_error);
- exit(EXIT_FAILURE);
- }
+ qemu_init_main_loop(&error_fatal);
qcrypto_init(&error_fatal);
diff --git a/qemu-io.c b/qemu-io.c
index 57f0750..3924639 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -529,7 +529,6 @@
int flags = BDRV_O_UNMAP;
int ret;
bool writethrough = true;
- Error *local_error = NULL;
QDict *opts = NULL;
const char *format = NULL;
bool force_share = false;
@@ -629,10 +628,7 @@
exit(1);
}
- if (qemu_init_main_loop(&local_error)) {
- error_report_err(local_error);
- exit(1);
- }
+ qemu_init_main_loop(&error_fatal);
if (!trace_init_backends()) {
exit(1);
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 26ffbf1..65ebec5 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -963,10 +963,7 @@
}
}
- if (qemu_init_main_loop(&local_err)) {
- error_report_err(local_err);
- exit(EXIT_FAILURE);
- }
+ qemu_init_main_loop(&error_fatal);
bdrv_init();
atexit(qemu_nbd_shutdown);
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index 7b9389b..f281dae 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -1044,10 +1044,7 @@
}
}
- if (qemu_init_main_loop(&local_err)) {
- error_report_err(local_err);
- exit(EXIT_FAILURE);
- }
+ qemu_init_main_loop(&error_fatal);
server_watch = qio_channel_add_watch(QIO_CHANNEL(server_ioc),
G_IO_IN,
@@ -1061,10 +1058,8 @@
}
}
- if ((daemonize || pidfile_specified) &&
- !qemu_write_pidfile(pidfile, &local_err)) {
- error_report_err(local_err);
- exit(EXIT_FAILURE);
+ if (daemonize || pidfile_specified) {
+ qemu_write_pidfile(pidfile, &error_fatal);
}
#ifdef CONFIG_LIBCAP_NG
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 5ca11e7..6227f8f 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2694,12 +2694,7 @@
qemu_machine_creation_done();
if (loadvm) {
- Error *local_err = NULL;
- if (!load_snapshot(loadvm, NULL, false, NULL, &local_err)) {
- error_report_err(local_err);
- autostart = 0;
- exit(1);
- }
+ load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
}
if (replay_mode != REPLAY_MODE_NONE) {
replay_vmstate_init();
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 83df8c0..0b2c8f5 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -737,7 +737,6 @@
sev_launch_finish(SevGuestState *sev)
{
int ret, error;
- Error *local_err = NULL;
trace_kvm_sev_launch_finish();
ret = sev_ioctl(sev->sev_fd, KVM_SEV_LAUNCH_FINISH, 0, &error);
@@ -752,12 +751,7 @@
/* add migration blocker */
error_setg(&sev_mig_blocker,
"SEV: Migration is not implemented");
- ret = migrate_add_blocker(sev_mig_blocker, &local_err);
- if (local_err) {
- error_report_err(local_err);
- error_free(sev_mig_blocker);
- exit(1);
- }
+ migrate_add_blocker(sev_mig_blocker, &error_fatal);
}
static void
diff --git a/ui/console.c b/ui/console.c
index 1103b65..5d2e617 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1508,7 +1508,6 @@
"This VM has no graphic display device.";
static DisplaySurface *dummy;
QemuConsole *con;
- Error *err = NULL;
assert(!dcl->ds);
@@ -1523,9 +1522,8 @@
dcl->con->gl = dcl;
}
- if (dcl->con && !dpy_compatible_with(dcl->con, dcl, &err)) {
- error_report_err(err);
- exit(1);
+ if (dcl->con) {
+ dpy_compatible_with(dcl->con, dcl, &error_fatal);
}
trace_displaychangelistener_register(dcl, dcl->ops->dpy_name);
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 0371055..31974b8 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -671,18 +671,13 @@
}
passwordSecret = qemu_opt_get(opts, "password-secret");
if (passwordSecret) {
- Error *local_err = NULL;
if (qemu_opt_get(opts, "password")) {
error_report("'password' option is mutually exclusive with "
"'password-secret'");
exit(1);
}
password = qcrypto_secret_lookup_as_utf8(passwordSecret,
- &local_err);
- if (!password) {
- error_report_err(local_err);
- exit(1);
- }
+ &error_fatal);
} else {
str = qemu_opt_get(opts, "password");
if (str) {
