Commit 702832b8 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

vl: Clean up error reporting in machine_set_property() 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181017082702.5581-22-armbru@redhat.com>
parent dd4af977

vl.c

+3 −6
Original line number Diff line number Diff line
@@ -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);