Commit 9338570b authored by Markus Armbruster's avatar Markus Armbruster
Browse files

spice: Clean up error reporting in add_channel() 



Calling error_report() in a function that takes an Error ** argument
is suspicious.  add_channel() does that, and then exit()s.  Its caller
main(), via qemu_opts_foreach(), is fine with it, but clean it up
anyway.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181017082702.5581-31-armbru@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent d10e05f1

ui/spice-core.c

+7 −6
Original line number Diff line number Diff line
@@ -597,9 +597,9 @@ static int add_channel(void *opaque, const char *name, const char *value, 
    if (strcmp(name, "tls-channel") == 0) {

        int *tls_port = opaque;

        if (!*tls_port) {

            error_report("spice: tried to setup tls-channel"

            error_setg(errp, "spice: tried to setup tls-channel"

                       " without specifying a TLS port");

            exit(1);

            return -1;

        }

        security = SPICE_CHANNEL_SECURITY_SSL;

    }
@@ -615,8 +615,9 @@ static int add_channel(void *opaque, const char *name, const char *value, 
        rc = spice_server_set_channel_security(spice_server, value, security);

    }

    if (rc != 0) {

        error_report("spice: failed to set channel security for %s", value);

        exit(1);

        error_setg(errp, "spice: failed to set channel security for %s",

                   value);

        return -1;

    }

    return 0;

}
@@ -787,7 +788,7 @@ void qemu_spice_init(void) 
    spice_server_set_playback_compression

        (spice_server, qemu_opt_get_bool(opts, "playback-compression", 1));



    qemu_opt_foreach(opts, add_channel, &tls_port, NULL);

    qemu_opt_foreach(opts, add_channel, &tls_port, &error_fatal);



    spice_server_set_name(spice_server, qemu_name);

    spice_server_set_uuid(spice_server, (unsigned char *)&qemu_uuid);