From nobody Mon Feb 9 11:05:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552544272632661.2761360218099; Wed, 13 Mar 2019 23:17:52 -0700 (PDT) Received: from localhost ([127.0.0.1]:57646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4Jgb-0006Z7-MA for importer@patchew.org; Thu, 14 Mar 2019 02:17:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4JcU-0003sp-RP for qemu-devel@nongnu.org; Thu, 14 Mar 2019 02:13:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4JaP-0006uU-Sc for qemu-devel@nongnu.org; Thu, 14 Mar 2019 02:11:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53809) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4JaP-0006uD-Mp for qemu-devel@nongnu.org; Thu, 14 Mar 2019 02:11:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DADFB3078AB3 for ; Thu, 14 Mar 2019 06:11:24 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D1781A927; Thu, 14 Mar 2019 06:11:20 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3036117535; Thu, 14 Mar 2019 07:11:19 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 07:11:19 +0100 Message-Id: <20190314061119.6218-3-kraxel@redhat.com> In-Reply-To: <20190314061119.6218-1-kraxel@redhat.com> References: <20190314061119.6218-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 14 Mar 2019 06:11:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] virtio-gpu: clear command queue on reset 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It was never correct to not clear them. Due to commit "3912e66a3feb virtio-vga: fix reset." this became more obvious though. The virtio rings get properly reset now, and trying to process the stale commands will trigger an assert in the virtio core. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/display/virtio-gpu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index fbd8d908ad32..cdab327658d2 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1356,6 +1356,7 @@ static void virtio_gpu_reset(VirtIODevice *vdev) { VirtIOGPU *g =3D VIRTIO_GPU(vdev); struct virtio_gpu_simple_resource *res, *tmp; + struct virtio_gpu_ctrl_command *cmd; int i; =20 g->enable =3D 0; @@ -1372,6 +1373,12 @@ static void virtio_gpu_reset(VirtIODevice *vdev) g->scanout[i].ds =3D NULL; } =20 + while (!QTAILQ_EMPTY(&g->cmdq)) { + cmd =3D QTAILQ_FIRST(&g->cmdq); + QTAILQ_REMOVE(&g->cmdq, cmd, next); + g_free(cmd); + } + #ifdef CONFIG_VIRGL if (g->use_virgl_renderer) { if (g->renderer_blocked) { --=20 2.18.1