diff options
| author | Marc-André Lureau | 2019-02-21 12:06:56 +0100 |
|---|---|---|
| committer | Gerd Hoffmann | 2019-02-21 14:09:17 +0100 |
| commit | 79216718f921505347bbfc61a4161adef6185cf2 (patch) | |
| tree | f786f4c04d0f47b5c2d271646c88a8c7372b7a28 | |
| parent | spice: avoid spice runtime assert (diff) | |
| download | qemu-79216718f921505347bbfc61a4161adef6185cf2.tar.gz qemu-79216718f921505347bbfc61a4161adef6185cf2.tar.xz qemu-79216718f921505347bbfc61a4161adef6185cf2.zip | |
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: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Victor Toso <victortoso@redhat.com>
Message-id: 20190221110703.5775-5-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | ui/spice-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 784fddff7d..1cc9960277 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -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", |