[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/12] spice: avoid spice runtime assert
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 04/12] spice: avoid spice runtime assert |
Date: |
Thu, 20 Dec 2018 18:15:45 +0400 |
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>
---
ui/spice-core.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/ui/spice-core.c b/ui/spice-core.c
index fc850b3f50..1f1501de78 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -922,12 +922,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.20.1.2.gb21ebb671b
- [Qemu-devel] [PATCH v2 00/12] spice: add -display spice-app, setup and launch a Spice client, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 10/12] qapi: document DisplayType enum, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 07/12] char: move SpiceChardev and open_spice_port() to spice.h header, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 11/12] spice: use a default name for the server, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 06/12] spice: do not stop spice if VM is paused, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 04/12] spice: avoid spice runtime assert,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 09/12] build-sys: add gio-2.0 check, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 02/12] char/spice: trigger HUP event, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 08/12] char: register spice ports after spice started, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 12/12] display: add -display spice-app launching a Spice client, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 01/12] configure: bump spice-server required version to 0.12.5, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 03/12] char/spice: discard write() if backend is disconnected, Marc-André Lureau, 2018/12/20
- [Qemu-devel] [PATCH v2 05/12] spice: merge options lists, Marc-André Lureau, 2018/12/20
- Re: [Qemu-devel] [PATCH v2 00/12] spice: add -display spice-app, setup and launch a Spice client, Victor Toso, 2018/12/21