Commit 2d5a3a8b authored by Markus Armbruster's avatar Markus Armbruster
Browse files

vl: Clean up error reporting in mon_init_func() 



Calling error_report() in a function that takes an Error ** argument
is suspicious.  mon_init_func() 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-23-armbru@redhat.com>
parent 702832b8

vl.c

+6 −8
Original line number Diff line number Diff line
@@ -2270,8 +2270,8 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) 
    } else if (strcmp(mode, "control") == 0) {

        flags = MONITOR_USE_CONTROL;

    } else {

        error_report("unknown monitor mode \"%s\"", mode);

        exit(1);

        error_setg(errp, "unknown monitor mode \"%s\"", mode);

        return -1;

    }



    if (qemu_opt_get_bool(opts, "pretty", 0))
@@ -2285,8 +2285,8 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) 
    chardev = qemu_opt_get(opts, "chardev");

    chr = qemu_chr_find(chardev);

    if (chr == NULL) {

        error_report("chardev \"%s\" not found", chardev);

        exit(1);

        error_setg(errp, "chardev \"%s\" not found", chardev);

        return -1;

    }



    monitor_init(chr, flags);
@@ -4413,10 +4413,8 @@ int main(int argc, char **argv, char **envp) 
    default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);

    default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);



    if (qemu_opts_foreach(qemu_find_opts("mon"),

                          mon_init_func, NULL, NULL)) {

        exit(1);

    }

    qemu_opts_foreach(qemu_find_opts("mon"),

                      mon_init_func, NULL, &error_fatal);



    if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)

        exit(1);