Patchwork qxl: Ignore set_client_capabilities pre/post migrate

login
register
mail settings
Submitter Hans de Goede
Date Sept. 7, 2012, 7:48 p.m.
Message ID <1347047302-8133-1-git-send-email-hdegoede@redhat.com>
Download mbox | patch
Permalink /patch/182438/
State New
Headers show

Comments

Hans de Goede - Sept. 7, 2012, 7:48 p.m.
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 <hdegoede@redhat.com>
---
 hw/qxl.c | 5 +++++
 1 file changed, 5 insertions(+)
Gerd Hoffmann - Sept. 10, 2012, 8:50 a.m.
On 09/07/12 21:48, Hans de Goede wrote:
> 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.

Patch added to spice patch queue.

thanks,
  Gerd

Patch

diff --git a/hw/qxl.c b/hw/qxl.c
index 045432e..1b400f1 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;