From nobody Thu Nov 13 06:11:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578229161; cv=none; d=zohomail.com; s=zohoarc; b=TqRcIqmMFzkl58ozVZhEtgWiDbWyVIPhdlz6OaH9SmfAh7tuSZbqfJvuHuOsK+Resrxt4nUSYyQsb46bcQ1Vv1foZ9rXL73T7Y8la/s+VhA+5yasQtdHZoBkmnUOKx5ufMbbZT3i5Mxc0t22WZZ3av6C3lhPVKFDW087I/76ry4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578229161; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ky3AoPDK1Dl90THjFQNp/2P2m3Le5A8fcjpKsYSUby0=; b=GbumFfqolMfvK1vG1P2wvAVEVyvYoFp1n5egduhaNZ6weiUSkU6ep3sYFXUD6Da+NYu0oOKL/2a/+mQhf9wQlfFlP/SXCh7fkhoMNb6bW1bvdf4THvEdnKoFEMnN/dZqdQQ+dEyZsK7TqofKOwt9Vfv5WUlI1o5msApQWzPE4P8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578229161764421.22986238493047; Sun, 5 Jan 2020 04:59:21 -0800 (PST) Received: from localhost ([::1]:41786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io5V2-0002Gd-4n for importer@patchew.org; Sun, 05 Jan 2020 07:59:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58023) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io5TI-0000P5-04 for qemu-devel@nongnu.org; Sun, 05 Jan 2020 07:57:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io5TH-0003RR-1n for qemu-devel@nongnu.org; Sun, 05 Jan 2020 07:57:31 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33947 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1io5TG-0003Qx-TL for qemu-devel@nongnu.org; Sun, 05 Jan 2020 07:57:31 -0500 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-175-c6z1mY36Nay18Qe9GMr9aw-1; Sun, 05 Jan 2020 07:57:26 -0500 Received: by mail-qt1-f198.google.com with SMTP id e8so8946396qtg.9 for ; Sun, 05 Jan 2020 04:57:26 -0800 (PST) Received: from redhat.com (bzq-79-183-34-164.red.bezeqint.net. [79.183.34.164]) by smtp.gmail.com with ESMTPSA id l19sm21531653qtq.48.2020.01.05.04.57.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2020 04:57:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578229048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ky3AoPDK1Dl90THjFQNp/2P2m3Le5A8fcjpKsYSUby0=; b=D3VHnbYg7+IctQi4zToZMmZquMO9B03QHkxFr5piFhTpXNYl92xrds2Ol5VDlO5RbcJFZ+ KvgEcW8RZH8ymSc24GVYmyBcFJMxkk7+Jdrwx8LQiq78nsEC6RJBlJlXJfAK07WYrLUGNS jFV0ZO/0oK22EpNmOrvoJBhKV+hjEuA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=S797ekb1koe77yVikHhjJoQQO+mcOVBkg02x1T+LNQw=; b=jn53EQV5wCQz9tMFZkDwUgQtxA3ZsRZ4naV2IQGZ0NkXfMGj2uFWHW2+uwWd7I++Pq vGdBg8v58zFz4jsdYBe/kXcQbaa3XziY1pYuhuUTKBHUBtKjAmCltaDjZHdAHuwlnUGM WxlGlLLpt76BEiFflrDB7UgsJ0EqSd3A6VDIc7qLFusnOISty3BgJf/R+XcSaBaYCvfa CtCvpNycnDs53y3ersXQasLpc5StzsrftMksBr49fSXJhbOsMYRO5Loelic4IPftCs1X WqF5n6X6yCZKJXt1/elnASpijrUSpyvDjDKJY/wSCGPqTtkEdpFh/Y56hnVkXHmJlJ4t ZxDA== X-Gm-Message-State: APjAAAVLaOZqGb4LsR9W6EThRylb5Qu/SiovTSEQOuce3HLWZuzX1jft LcFg8LM43gf6Cap9JNA1ZFkkwHKerJ92D7lJwXkfhCm9MAycBGDkHrr4N8DYfAbc8b+Nx344PCV hFrXLmgm5TBVRj6M= X-Received: by 2002:a05:6214:13ef:: with SMTP id ch15mr68673854qvb.183.1578229046153; Sun, 05 Jan 2020 04:57:26 -0800 (PST) X-Google-Smtp-Source: APXvYqwGEkOL4TCdQsqJcdin/3NQQWXkgkSx+Z3V8ACExs9c74RHybbBIX30MaW53oxyD8AVJmoUkw== X-Received: by 2002:a05:6214:13ef:: with SMTP id ch15mr68673841qvb.183.1578229045940; Sun, 05 Jan 2020 04:57:25 -0800 (PST) Date: Sun, 5 Jan 2020 07:57:21 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v3 01/32] virtio: add ability to delete vq through a pointer Message-ID: <20200105125622.27231-2-mst@redhat.com> References: <20200105125622.27231-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200105125622.27231-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: c6z1mY36Nay18Qe9GMr9aw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Devices tend to maintain vq pointers, allow deleting them trough a vq point= er. Signed-off-by: Michael S. Tsirkin Reviewed-by: David Hildenbrand Reviewed-by: David Hildenbrand --- include/hw/virtio/virtio.h | 2 ++ hw/virtio/virtio.c | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index c32a815303..e18756d50d 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -183,6 +183,8 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int que= ue_size, =20 void virtio_del_queue(VirtIODevice *vdev, int n); =20 +void virtio_delete_queue(VirtQueue *vq); + void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem, unsigned int len); void virtqueue_flush(VirtQueue *vq, unsigned int count); diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 04716b5f6c..31dd140990 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2330,17 +2330,22 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int= queue_size, return &vdev->vq[i]; } =20 +void virtio_delete_queue(VirtQueue *vq) +{ + vq->vring.num =3D 0; + vq->vring.num_default =3D 0; + vq->handle_output =3D NULL; + vq->handle_aio_output =3D NULL; + g_free(vq->used_elems); +} + void virtio_del_queue(VirtIODevice *vdev, int n) { if (n < 0 || n >=3D VIRTIO_QUEUE_MAX) { abort(); } =20 - vdev->vq[n].vring.num =3D 0; - vdev->vq[n].vring.num_default =3D 0; - vdev->vq[n].handle_output =3D NULL; - vdev->vq[n].handle_aio_output =3D NULL; - g_free(vdev->vq[n].used_elems); + virtio_delete_queue(&vdev->vq[n]); } =20 static void virtio_set_isr(VirtIODevice *vdev, int value) --=20 MST