[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_se
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_set_property() |
Date: |
Wed, 17 Oct 2018 10:26:45 +0200 |
Calling error_report() in a function that takes an Error ** argument
is suspicious. machine_set_property() does that, and then fails without
setting an error. Its caller main(), via qemu_opts_foreach(), is fine
with it, but clean it up anyway.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
vl.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index aa03192019..c3c17106bf 100644
--- a/vl.c
+++ b/vl.c
@@ -2676,7 +2676,7 @@ static int machine_set_property(void *opaque,
g_free(qom_name);
if (local_err) {
- error_report_err(local_err);
+ error_propagate(errp, local_err);
return -1;
}
@@ -4248,11 +4248,8 @@ int main(int argc, char **argv, char **envp)
}
machine_opts = qemu_get_machine_opts();
- if (qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
- NULL)) {
- object_unref(OBJECT(current_machine));
- exit(1);
- }
+ qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
+ &error_fatal);
configure_accelerator(current_machine);
--
2.17.1
- Re: [Qemu-devel] [PATCH v4 03/38] block: Use warn_report() & friends to report warnings, (continued)
[Qemu-devel] [PATCH v4 18/38] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 11/38] smbios: Clean up error handling in smbios_add(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 20/38] vl: Clean up error reporting in chardev_init_func(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 15/38] numa: Fix QMP command set-numa-node error handling, Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 13/38] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 22/38] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 27/38] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_set_property(),
Markus Armbruster <=
[Qemu-devel] [PATCH v4 06/38] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 19/38] qom: Clean up error reporting in user_creatable_add_opts_foreach(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 23/38] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 24/38] vl: Clean up error reporting in device_init_func(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 28/38] numa: Clean up error reporting in parse_numa(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 30/38] spice: Clean up error reporting in add_channel(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 33/38] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 29/38] tpm: Clean up error reporting in tpm_init_tpmdev(), Markus Armbruster, 2018/10/17
[Qemu-devel] [PATCH v4 32/38] vl: Assert drive_new() does not fail in default_drive(), Markus Armbruster, 2018/10/17