[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] main-loop: Use &error_fatal when calling qemu_i
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 4/6] main-loop: Use &error_fatal when calling qemu_init_main_loop() |
Date: |
Thu, 12 May 2016 11:10:02 -0300 |
Signed-off-by: Eduardo Habkost <address@hidden>
---
qemu-img.c | 5 +----
qemu-io.c | 5 +----
qemu-nbd.c | 5 +----
vl.c | 6 +-----
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 46f2a6d..d3cfec3 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3465,10 +3465,7 @@ int main(int argc, char **argv)
error_set_progname(argv[0]);
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);
if (qcrypto_init(&local_error) < 0) {
error_reportf_err(local_error, "cannot initialize crypto: ");
diff --git a/qemu-io.c b/qemu-io.c
index 0598251..1507559 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -527,10 +527,7 @@ int main(int argc, char **argv)
exit(1);
}
- if (qemu_init_main_loop(&local_error)) {
- error_report_err(local_error);
- exit(1);
- }
+ qemu_init_main_loop(&error_fatal);
if (qemu_opts_foreach(&qemu_object_opts,
user_creatable_add_opts_foreach,
diff --git a/qemu-nbd.c b/qemu-nbd.c
index c55b40f..f2685e67 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -820,10 +820,7 @@ int main(int argc, char **argv)
saddr = nbd_build_socket_address(sockpath, bindto, port);
- if (qemu_init_main_loop(&local_err)) {
- error_report_err(local_err);
- exit(EXIT_FAILURE);
- }
+ qemu_init_main_loop(&error_fatal);
bdrv_init();
atexit(bdrv_close_all);
diff --git a/vl.c b/vl.c
index eea8a04..e435926 100644
--- a/vl.c
+++ b/vl.c
@@ -2964,7 +2964,6 @@ int main(int argc, char **argv, char **envp)
ram_addr_t maxram_size;
uint64_t ram_slots = 0;
FILE *vmstate_dump_file = NULL;
- Error *main_loop_err = NULL;
Error *err = NULL;
qemu_init_cpu_loop();
@@ -4001,10 +4000,7 @@ int main(int argc, char **argv, char **envp)
os_daemonize();
- if (qemu_init_main_loop(&main_loop_err)) {
- error_report_err(main_loop_err);
- exit(1);
- }
+ qemu_init_main_loop(&error_fatal);
if (qemu_opts_foreach(qemu_find_opts("sandbox"),
parse_sandbox, NULL, NULL)) {
--
2.5.5
- [Qemu-devel] [PATCH 0/6] Use &error_fatal in some initialization code, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 1/6] vl: Use &error_fatal when parsing VNC options, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 2/6] vl: Use &error_fatal when parsing monitor options, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 6/6] Use &error_fatal when initializing crypto on qemu-{img, io, nbd}, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 3/6] main-loop: Use Error** to report qemu_signal_init() errors, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 4/6] main-loop: Use &error_fatal when calling qemu_init_main_loop(),
Eduardo Habkost <=
- [Qemu-devel] [PATCH 5/6] main-loop: Make qemu_init_main_loop() and qemu_signal_init() void, Eduardo Habkost, 2016/05/12
- Re: [Qemu-devel] [PATCH 0/6] Use &error_fatal in some initialization code, Paolo Bonzini, 2016/05/12