[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/16] spice: stop server for qxl hard reset
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 16/16] spice: stop server for qxl hard reset |
Date: |
Mon, 16 Dec 2013 10:31:17 +0100 |
Hard reset can happen at any time. We should be able to put qxl into a
known-good state no matter what. Stop spice server thread for reset so
it can't be confused by fetching stale commands lingering around in the
rings while we reset is ongoing.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/display/qxl.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index efdefd6..e4f172e 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -1144,8 +1144,14 @@ static void qxl_soft_reset(PCIQXLDevice *d)
static void qxl_hard_reset(PCIQXLDevice *d, int loadvm)
{
+ bool startstop = qemu_spice_display_is_running(&d->ssd);
+
trace_qxl_hard_reset(d->id, loadvm);
+ if (startstop) {
+ qemu_spice_display_stop();
+ }
+
qxl_spice_reset_cursor(d);
qxl_spice_reset_image_cache(d);
qxl_reset_surfaces(d);
@@ -1159,6 +1165,10 @@ static void qxl_hard_reset(PCIQXLDevice *d, int loadvm)
}
qemu_spice_create_host_memslot(&d->ssd);
qxl_soft_reset(d);
+
+ if (startstop) {
+ qemu_spice_display_start();
+ }
}
static void qxl_reset_handler(DeviceState *dev)
--
1.8.3.1
- [Qemu-devel] [PULL 00/16] spice patch queue, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 02/16] vscclient: do not add a socket watch if there is not data to send, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 01/16] spice: flip streaming video mode to off by default, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 03/16] spice-char: remove unused field, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 10/16] nbd: pass export name as init argument, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 08/16] Split nbd block client code, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 09/16] nbd: don't change socket block during negotiate, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 04/16] qmp_change_blockdev() remove unused has_format, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 16/16] spice: stop server for qxl hard reset,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 11/16] nbd: make nbd_client_session_close() idempotent, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 07/16] spice-char: implement chardev port event, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 05/16] include: add missing config-host.h include, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 12/16] nbd: finish any pending coroutine, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 14/16] spice: move qemu_spice_display_*() from spice-graphics to spice-core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 15/16] spice: move spice_server_vm_{start, stop} calls into qemu_spice_display_*(), Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 13/16] nbd: avoid uninitialized warnings, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 06/16] char: add qemu_chr_fe_event(), Gerd Hoffmann, 2013/12/16