From nobody Thu Apr 18 20:03: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.zohomail.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 1500284771787806.9670980891316; Mon, 17 Jul 2017 02:46:11 -0700 (PDT) Received: from localhost ([::1]:49069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2bS-0005iS-Bk for importer@patchew.org; Mon, 17 Jul 2017 05:46:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2XZ-0002Ee-Ig for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX2XY-0003Q9-F4 for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:42:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX2XY-0003Nc-8R for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:42:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3BAFC7CB89 for ; Mon, 17 Jul 2017 09:42:07 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FDC070948; Mon, 17 Jul 2017 09:42:00 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 796EC1602B0; Mon, 17 Jul 2017 11:41:59 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3BAFC7CB89 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 3BAFC7CB89 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 11:41:59 +0200 Message-Id: <20170717094159.16447-2-kraxel@redhat.com> In-Reply-To: <20170717094159.16447-1-kraxel@redhat.com> References: <20170717094159.16447-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 17 Jul 2017 09:42:07 +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] [PULL 1/1] virtio-gpu: skip update cursor in post_load if we don't have one 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 , "Michael S. Tsirkin" 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" If the cursor resource id isn't set the guest didn't define a cursor. Skip the cursor update in post_load in that that case. Reported-by: wanghaibin Signed-off-by: Gerd Hoffmann Tested-by: wanghaibin Message-id: 20170710070432.856-1-kraxel@redhat.com Signed-off-by: Gerd Hoffmann --- hw/display/virtio-gpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 0506d2c1b0..6aae147324 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1092,7 +1092,9 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,= size_t size, =20 dpy_gfx_replace_surface(scanout->con, scanout->ds); dpy_gfx_update(scanout->con, 0, 0, scanout->width, scanout->height= ); - update_cursor(g, &scanout->cursor); + if (scanout->cursor.resource_id) { + update_cursor(g, &scanout->cursor); + } res->scanout_bitmask |=3D (1 << i); } =20 --=20 2.9.3