[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/15] spice: avoid spice runtime assert
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 07/15] spice: avoid spice runtime assert |
Date: |
Fri, 22 Feb 2019 08:53:18 +0100 |
From: Marc-André Lureau <address@hidden>
The Spice server doesn't like to be started or stopped twice . It
aborts with:
(process:6191): Spice-ERROR **: 19:29:35.912:
red-worker.c:623:handle_dev_start: assertion `!worker->running' failed
It's easy to avoid that situation since qemu spice_display_is_running
tracks the server state.
After the commit "spice: do not stop spice if VM is paused", it will
be possible to pause and resume the VM, and this will call
qemu_spice_display_start() twice. The easiest is to add a check for
spice_display_is_running with this patch to avoid the assert.
Signed-off-by: Marc-André Lureau <address@hidden>
Tested-by: Victor Toso <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/spice-core.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 37fae3c42405..784fddff7d45 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -972,12 +972,20 @@ int qemu_spice_display_add_client(int csock, int
skipauth, int tls)
void qemu_spice_display_start(void)
{
+ if (spice_display_is_running) {
+ return;
+ }
+
spice_display_is_running = true;
spice_server_vm_start(spice_server);
}
void qemu_spice_display_stop(void)
{
+ if (!spice_display_is_running) {
+ return;
+ }
+
spice_server_vm_stop(spice_server);
spice_display_is_running = false;
}
--
2.9.3
- [Qemu-devel] [PULL 00/15] Ui 20190222 patches, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 04/15] ui/gtk: Fix the license information, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 09/15] spice: do not stop spice if VM is paused, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 13/15] qapi: document DisplayType enum, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 02/15] spice: set device address and device display ID in QXL interface, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 03/15] sdl2: drop qemu_input_event_send_key_qcode call, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 14/15] spice: use a default name for the server, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 10/15] char: move SpiceChardev and open_spice_port() to spice.h header, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 07/15] spice: avoid spice runtime assert,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 11/15] char: register spice ports after spice started, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 08/15] spice: merge options lists, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 05/15] char/spice: trigger HUP event, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 01/15] kbd-state: don't block auto-repeat events, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 12/15] build-sys: add gio-2.0 check, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 06/15] char/spice: discard write() if backend is disconnected, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 15/15] display: add -display spice-app launching a Spice client, Gerd Hoffmann, 2019/02/22
- Re: [Qemu-devel] [PULL 00/15] Ui 20190222 patches, Peter Maydell, 2019/02/25