OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vl: Clean up error reporting in machine_set_property()

Browse Source 
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 <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181017082702.5581-22-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-10-17 10:26:45 +02:00
parent dd4af97733
commit 702832b8c0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vl.c
View File

@ -2677,7 +2677,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;
}
@ -4249,11 +4249,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);