[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/10] qxl: Ignore set_client_capabilities pre/post
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 06/10] qxl: Ignore set_client_capabilities pre/post migrate |
Date: |
Thu, 13 Sep 2012 10:45:22 +0200 |
From: Hans de Goede <address@hidden>
The recent introduction of set_client_capabilities has broken
(seamless) migration by trying to call qxl_send_events pre (seamless
incoming) and post (*) migration, triggering the following assert:
qxl_send_events: Assertion `qemu_spice_display_is_running(&d->ssd)' failed.
The solution is easy, pre migration the guest will have already received
the client caps on the migration source side, and post migration there no
longer is a guest, so we can simply ignore the set_client_capabilities call
in both those scenarios.
*) Post migration, so not fatal for to the migration itself, but still a crash
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index 0176b1a..e539134 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -953,6 +953,11 @@ static void interface_set_client_capabilities(QXLInstance
*sin,
{
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
+ if (runstate_check(RUN_STATE_INMIGRATE) ||
+ runstate_check(RUN_STATE_POSTMIGRATE)) {
+ return;
+ }
+
qxl->shadow_rom.client_present = client_present;
memcpy(qxl->shadow_rom.client_capabilities, caps, sizeof(caps));
qxl->rom->client_present = client_present;
--
1.7.1
- [Qemu-devel] [PULL 00/10] spice patch queue, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 01/10] spice: switch to queue for vga mode updates, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 08/10] hw/qxl: tracing fixes, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 03/10] spice: add screen mirror, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 10/10] hw/qxl: support client monitor configuration via device, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 06/10] qxl: Ignore set_client_capabilities pre/post migrate,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 04/10] spice: send updates only for changed screen content, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 07/10] qxl: better cleanup for surface destroy, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 09/10] qxl: add trace-event for QXL_IO_LOG, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 05/10] qxl: dont update invalid area, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 02/10] spice: split qemu_spice_create_update, Gerd Hoffmann, 2012/09/13
- Re: [Qemu-devel] [PULL 00/10] spice patch queue, Michael Tokarev, 2012/09/14
- Re: [Qemu-devel] [PULL 00/10] spice patch queue, Anthony Liguori, 2012/09/17