diff options
author | Markus Armbruster <armbru@redhat.com> | 2015-12-18 16:35:11 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 15:16:17 +0100 |
commit | 73eaa04777001e6d68181910ed36729528f77d74 (patch) | |
tree | 77c61d71e04555c48cd1b19f8ea2509b590a2950 | |
parent | a4699e55f596e552c9b45028a0e831c3438f768d (diff) | |
download | qemu-73eaa04777001e6d68181910ed36729528f77d74.zip qemu-73eaa04777001e6d68181910ed36729528f77d74.tar.gz qemu-73eaa04777001e6d68181910ed36729528f77d74.tar.bz2 |
test-throttle: Simplify qemu_init_main_loop() error handling
The code looks like it tries to check for both qemu_init_main_loop()
and qemu_get_aio_context() failure in one conditional. In fact,
qemu_get_aio_context() can fail only after qemu_init_main_loop()
failed.
Simplify accordingly: check for qemu_init_main_loop() error directly,
without bothering to improve its error message. Call
qemu_get_aio_context() only when qemu_get_aio_context() succeeded. It
can't fail then, so no need to check.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-9-git-send-email-armbru@redhat.com>
-rw-r--r-- | tests/test-throttle.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/tests/test-throttle.c b/tests/test-throttle.c index 85c9b6c..a95039f 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -581,21 +581,8 @@ static void test_groups(void) int main(int argc, char **argv) { - Error *local_error = NULL; - - qemu_init_main_loop(&local_error); + qemu_init_main_loop(&error_fatal); ctx = qemu_get_aio_context(); - - if (!ctx) { - error_report("Failed to create AIO Context: '%s'", - local_error ? error_get_pretty(local_error) : - "Failed to initialize the QEMU main loop"); - if (local_error) { - error_free(local_error); - } - exit(1); - } - bdrv_init(); do {} while (g_main_context_iteration(NULL, false)); |