From nobody Wed Apr 16 22:17:56 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates
192.237.175.120 as permitted sender) client-ip=192.237.175.120;
envelope-from=xen-devel-bounces@lists.xenproject.org;
helo=lists.xenproject.org;
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of lists.xenproject.org designates
192.237.175.120 as permitted sender)
smtp.mailfrom=xen-devel-bounces@lists.xenproject.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1642007871; cv=none;
d=zohomail.com; s=zohoarc;
b=gXHoyLrOTbHZeMPdfh9pyXKakS+aI10fsFvFbT9cMlDi/ZaYdo1U6r+ihYcAEGSz2AD7xIYdV3sjtr619WqfO5CcjsraLw1tSZcH5M3BmCqzX/i9veQh0UmkLPiHl0Yap6vyoHKpuuU7Z1H/ZvDjfiF04vca1nxJJL+bks6gwkM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1642007871;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=aqsXFWsKyZZ5dZYudB6A80tOB2G/EpTCq3EVK0XRkP8=;
b=Zg4heOh8uvm6HxL1HJpI/8yk675MtOMJPeKjdeDG9F6d7Ejaf7/KxuN6y5vBeuIrcfVi2Tibs1YuDZQtNNqNzdCS/Z3baTL/iBpQ4VjsSKHCYfJBQnLDyML//FYtoW8VvyvrzbsuNNYeV2oIpHur9HLSYQQxNVzrWUwe/GFyJ6Y=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of lists.xenproject.org designates
192.237.175.120 as permitted sender)
smtp.mailfrom=xen-devel-bounces@lists.xenproject.org;
dmarc=pass header.from=<stefanha@redhat.com> (p=none dis=none)
Return-Path: <xen-devel-bounces@lists.xenproject.org>
Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120])
by mx.zohomail.com
with SMTPS id 1642007871457134.0587847791952;
Wed, 12 Jan 2022 09:17:51 -0800 (PST)
Received: from list by lists.xenproject.org with
outflank-mailman.256787.440856 (Exim 4.92)
(envelope-from <xen-devel-bounces@lists.xenproject.org>)
id 1n7hFg-0006cA-1Y; Wed, 12 Jan 2022 17:17:36 +0000
Received: by outflank-mailman (output) from mailman id 256787.440856;
Wed, 12 Jan 2022 17:17:36 +0000
Received: from localhost ([127.0.0.1] helo=lists.xenproject.org)
by lists.xenproject.org with esmtp (Exim 4.92)
(envelope-from <xen-devel-bounces@lists.xenproject.org>)
id 1n7hFf-0006c3-UP; Wed, 12 Jan 2022 17:17:35 +0000
Received: by outflank-mailman (input) for mailman id 256787;
Wed, 12 Jan 2022 17:17:35 +0000
Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254]
helo=se1-gles-sth1.inumbo.com)
by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from
<SRS0=cmOE=R4=redhat.com=stefanha@srs-se1.protection.inumbo.net>)
id 1n7hFf-0006bp-76
for xen-devel@lists.xenproject.org; Wed, 12 Jan 2022 17:17:35 +0000
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.129.124])
by se1-gles-sth1.inumbo.com (Halon) with ESMTPS
id 87942e2f-73cb-11ec-bd6f-bfb69f65cdc7;
Wed, 12 Jan 2022 18:17:34 +0100 (CET)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-515-EJiA3gwjNV6WDvp4X4azrg-1; Wed, 12 Jan 2022 12:17:29 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B2ADA101F002;
Wed, 12 Jan 2022 17:17:25 +0000 (UTC)
Received: from localhost (unknown [10.39.195.79])
by smtp.corp.redhat.com (Postfix) with ESMTP id 4BB6B7FB9E;
Wed, 12 Jan 2022 17:17:25 +0000 (UTC)
X-Outflank-Mailman: Message body and most headers restored to incoming version
X-BeenThere: xen-devel@lists.xenproject.org
List-Id: Xen developer discussion <xen-devel.lists.xenproject.org>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
<mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
<mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
X-Inumbo-ID: 87942e2f-73cb-11ec-bd6f-bfb69f65cdc7
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1642007853;
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=aqsXFWsKyZZ5dZYudB6A80tOB2G/EpTCq3EVK0XRkP8=;
b=TX33KMosoxuNWKFdR4EzehaLuASl6kR2agR/knYlF+9CR5Au+EB6atoLYh3ZibVESswall
8YsDrv6upx/L/R/AXDDo70NbqPbCfZqKSv7ifAiiPS+jHauoJ9tKgcomsvB+Bi0yfisryX
ZavpiFYinCCf1dRdiSbu67YPZVJSjb0=
X-MC-Unique: EJiA3gwjNV6WDvp4X4azrg-1
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org,
Peter Maydell <peter.maydell@linaro.org>
Cc: Coiby Xu <Coiby.Xu@gmail.com>,
Fam Zheng <fam@euphon.net>,
Anthony Perard <anthony.perard@citrix.com>,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>,
Peter Lieven <pl@kamp.de>,
qemu-block@nongnu.org,
Julia Suvorova <jusual@redhat.com>,
Kevin Wolf <kwolf@redhat.com>,
"Richard W.M. Jones" <rjones@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>,
Paul Durrant <paul@xen.org>,
Stefan Weil <sw@weilnetz.de>,
Juan Quintela <quintela@redhat.com>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
xen-devel@lists.xenproject.org,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Aarushi Mehta <mehta.aaru20@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Hanna Reitz <hreitz@redhat.com>
Subject: [PULL 5/6] virtio: use ->handle_output() instead of
->handle_aio_output()
Date: Wed, 12 Jan 2022 17:14:01 +0000
Message-Id: <20220112171402.112183-6-stefanha@redhat.com>
In-Reply-To: <20220112171402.112183-1-stefanha@redhat.com>
References: <20220112171402.112183-1-stefanha@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1642007874196100001
Content-Type: text/plain; charset="utf-8"
The difference between ->handle_output() and ->handle_aio_output() was
that ->handle_aio_output() returned a bool return value indicating
progress. This was needed by the old polling API but now that the bool
return value is gone, the two functions can be unified.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20211207132336.36627-6-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/virtio/virtio.c | 33 +++------------------------------
1 file changed, 3 insertions(+), 30 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 323f549aad..e938e6513b 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -125,7 +125,6 @@ struct VirtQueue
=20
uint16_t vector;
VirtIOHandleOutput handle_output;
- VirtIOHandleOutput handle_aio_output;
VirtIODevice *vdev;
EventNotifier guest_notifier;
EventNotifier host_notifier;
@@ -2303,20 +2302,6 @@ void virtio_queue_set_align(VirtIODevice *vdev, int =
n, int align)
}
}
=20
-static void virtio_queue_notify_aio_vq(VirtQueue *vq)
-{
- if (vq->vring.desc && vq->handle_aio_output) {
- VirtIODevice *vdev =3D vq->vdev;
-
- trace_virtio_queue_notify(vdev, vq - vdev->vq, vq);
- vq->handle_aio_output(vdev, vq);
-
- if (unlikely(vdev->start_on_kick)) {
- virtio_set_started(vdev, true);
- }
- }
-}
-
static void virtio_queue_notify_vq(VirtQueue *vq)
{
if (vq->vring.desc && vq->handle_output) {
@@ -2395,7 +2380,6 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int q=
ueue_size,
vdev->vq[i].vring.num_default =3D queue_size;
vdev->vq[i].vring.align =3D VIRTIO_PCI_VRING_ALIGN;
vdev->vq[i].handle_output =3D handle_output;
- vdev->vq[i].handle_aio_output =3D NULL;
vdev->vq[i].used_elems =3D g_malloc0(sizeof(VirtQueueElement) *
queue_size);
=20
@@ -2407,7 +2391,6 @@ 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);
vq->used_elems =3D NULL;
virtio_virtqueue_reset_region_cache(vq);
@@ -3512,14 +3495,6 @@ EventNotifier *virtio_queue_get_guest_notifier(VirtQ=
ueue *vq)
return &vq->guest_notifier;
}
=20
-static void virtio_queue_host_notifier_aio_read(EventNotifier *n)
-{
- VirtQueue *vq =3D container_of(n, VirtQueue, host_notifier);
- if (event_notifier_test_and_clear(n)) {
- virtio_queue_notify_aio_vq(vq);
- }
-}
-
static void virtio_queue_host_notifier_aio_poll_begin(EventNotifier *n)
{
VirtQueue *vq =3D container_of(n, VirtQueue, host_notifier);
@@ -3539,7 +3514,7 @@ static void virtio_queue_host_notifier_aio_poll_ready=
(EventNotifier *n)
{
VirtQueue *vq =3D container_of(n, VirtQueue, host_notifier);
=20
- virtio_queue_notify_aio_vq(vq);
+ virtio_queue_notify_vq(vq);
}
=20
static void virtio_queue_host_notifier_aio_poll_end(EventNotifier *n)
@@ -3554,9 +3529,8 @@ void virtio_queue_aio_set_host_notifier_handler(VirtQ=
ueue *vq, AioContext *ctx,
VirtIOHandleOutput handle_output)
{
if (handle_output) {
- vq->handle_aio_output =3D handle_output;
aio_set_event_notifier(ctx, &vq->host_notifier, true,
- virtio_queue_host_notifier_aio_read,
+ virtio_queue_host_notifier_read,
virtio_queue_host_notifier_aio_poll,
virtio_queue_host_notifier_aio_poll_ready);
aio_set_event_notifier_poll(ctx, &vq->host_notifier,
@@ -3566,8 +3540,7 @@ void virtio_queue_aio_set_host_notifier_handler(VirtQ=
ueue *vq, AioContext *ctx,
aio_set_event_notifier(ctx, &vq->host_notifier, true, NULL, NULL, =
NULL);
/* Test and clear notifier before after disabling event,
* in case poll callback didn't have time to run. */
- virtio_queue_host_notifier_aio_read(&vq->host_notifier);
- vq->handle_aio_output =3D NULL;
+ virtio_queue_host_notifier_read(&vq->host_notifier);
}
}
=20
--=20
2.34.1