From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TC53H-0004fl-9s for qemu-devel@nongnu.org; Thu, 13 Sep 2012 04:45:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TC53D-00016b-3I for qemu-devel@nongnu.org; Thu, 13 Sep 2012 04:45:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TC53C-00016K-RE for qemu-devel@nongnu.org; Thu, 13 Sep 2012 04:45:31 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8D8jUF2031039 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 13 Sep 2012 04:45:30 -0400 From: Gerd Hoffmann Date: Thu, 13 Sep 2012 10:45:22 +0200 Message-Id: <1347525926-28563-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1347525926-28563-1-git-send-email-kraxel@redhat.com> References: <1347525926-28563-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 06/10] qxl: Ignore set_client_capabilities pre/post migrate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hans de Goede , Gerd Hoffmann From: Hans de Goede 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 Signed-off-by: Gerd Hoffmann --- 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