Commit 79216718 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

spice: merge options lists 



Passing several -spice options to qemu command line, or calling
several time qemu_opts_set() will ignore all but the first option
list. Since the spice server is a singleton, it makes sense to merge
all the options, the last value being the one taken into account.

This changes the behaviour from, for ex:
$ qemu... -spice port=5900 -spice port=5901 -> port: 5900
to:
$ qemu... -spice port=5900 -spice port=5901 -> port: 5901

(if necessary we could instead produce an error when an option is
given twice, although this makes handling default values and such more
complicated)

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: default avatarVictor Toso <victortoso@redhat.com>
Message-id: 20190221110703.5775-5-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 83f71802

ui/spice-core.c

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ static SpiceChannelList *qmp_query_spice_channels(void) 
static QemuOptsList qemu_spice_opts = {

    .name = "spice",

    .head = QTAILQ_HEAD_INITIALIZER(qemu_spice_opts.head),

    .merge_lists = true,

    .desc = {

        {

            .name = "port",