From nobody Fri May 3 19:46:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14887891574891008.5082364232579; Mon, 6 Mar 2017 00:32:37 -0800 (PST) Received: from localhost ([::1]:42399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cko4K-0002oZ-C4 for importer@patchew.org; Mon, 06 Mar 2017 03:32:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cko3o-0002n4-IV for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:32:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cko3l-0007NE-DO for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:32:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43718) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cko3l-0007MQ-7v for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:32:01 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E2FDB7E9DD for ; Mon, 6 Mar 2017 08:32:00 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-95.ams2.redhat.com [10.36.116.95]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v268VxrD021150; Mon, 6 Mar 2017 03:31:59 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 1AC6180915; Mon, 6 Mar 2017 09:31:57 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 6 Mar 2017 09:31:51 +0100 Message-Id: <1488789111-27340-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 06 Mar 2017 08:32:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] qxl: clear guest_cursor on QXL_CURSOR_HIDE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Make sure we don't leave guest_cursor pointing into nowhere. This might lead to (rare) live migration failures, due to target trying to restore the cursor from the stale pointer. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=3D1421788 Reported-by: Dr. David Alan Gilbert Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/display/qxl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index af4c0ca..0d02f0e 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -477,6 +477,11 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct= QXLCommandExt *ext) qxl->guest_cursor =3D ext->cmd.data; qemu_mutex_unlock(&qxl->track_lock); } + if (cmd->type =3D=3D QXL_CURSOR_HIDE) { + qemu_mutex_lock(&qxl->track_lock); + qxl->guest_cursor =3D 0; + qemu_mutex_unlock(&qxl->track_lock); + } break; } } --=20 1.8.3.1