qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hans de Goede <hdegoede@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 06/10] qxl: Ignore set_client_capabilities pre/post migrate
Date: Thu, 13 Sep 2012 10:45:22 +0200	[thread overview]
Message-ID: <1347525926-28563-7-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1347525926-28563-1-git-send-email-kraxel@redhat.com>

From: Hans de Goede <hdegoede@redhat.com>

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>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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

  parent reply	other threads:[~2012-09-13  8:45 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-13  8:45 [Qemu-devel] [PULL 00/10] spice patch queue Gerd Hoffmann
2012-09-13  8:45 ` [Qemu-devel] [PATCH 01/10] spice: switch to queue for vga mode updates Gerd Hoffmann
2012-09-13  8:45 ` [Qemu-devel] [PATCH 02/10] spice: split qemu_spice_create_update Gerd Hoffmann
2012-09-14 18:16   ` Blue Swirl
2012-09-13  8:45 ` [Qemu-devel] [PATCH 03/10] spice: add screen mirror Gerd Hoffmann
2012-09-13  8:45 ` [Qemu-devel] [PATCH 04/10] spice: send updates only for changed screen content Gerd Hoffmann
2012-09-13  8:45 ` [Qemu-devel] [PATCH 05/10] qxl: dont update invalid area Gerd Hoffmann
2012-09-19 13:40   ` Michael Tokarev
2012-09-13  8:45 ` Gerd Hoffmann [this message]
2012-09-13  8:45 ` [Qemu-devel] [PATCH 07/10] qxl: better cleanup for surface destroy Gerd Hoffmann
2012-09-13  8:45 ` [Qemu-devel] [PATCH 08/10] hw/qxl: tracing fixes Gerd Hoffmann
2012-09-13  8:45 ` [Qemu-devel] [PATCH 09/10] qxl: add trace-event for QXL_IO_LOG Gerd Hoffmann
2012-09-13  8:45 ` [Qemu-devel] [PATCH 10/10] hw/qxl: support client monitor configuration via device Gerd Hoffmann
2012-09-14  8:01 ` [Qemu-devel] [PULL 00/10] spice patch queue Michael Tokarev
2012-09-14  8:31   ` Gerd Hoffmann
2012-09-17 18:20 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347525926-28563-7-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=hdegoede@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).