virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org, eperezma@redhat.com, kvm@vger.kernel.org,
	virtualization@lists.linux-foundation.org
Subject: [PATCH RFC v5 06/13] vhost: reorder functions
Date: Sun, 7 Jun 2020 10:11:36 -0400	[thread overview]
Message-ID: <20200607141057.704085-7-mst@redhat.com> (raw)
In-Reply-To: <20200607141057.704085-1-mst@redhat.com>

Reorder functions in the file to not rely on forward
declarations, in preparation to making them static
down the road.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/vhost/vhost.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 5075505cfe55..3ffcba4e27e9 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -2299,6 +2299,13 @@ static int fetch_buf(struct vhost_virtqueue *vq)
 	return 1;
 }
 
+/* Reverse the effect of vhost_get_vq_desc. Useful for error handling. */
+void vhost_discard_vq_desc(struct vhost_virtqueue *vq, int n)
+{
+	vq->last_avail_idx -= n;
+}
+EXPORT_SYMBOL_GPL(vhost_discard_vq_desc);
+
 /* This function returns a value > 0 if a descriptor was found, or 0 if none were found.
  * A negative code is returned on error. */
 static int fetch_descs(struct vhost_virtqueue *vq)
@@ -2413,26 +2420,6 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq,
 }
 EXPORT_SYMBOL_GPL(vhost_get_vq_desc);
 
-/* Reverse the effect of vhost_get_vq_desc. Useful for error handling. */
-void vhost_discard_vq_desc(struct vhost_virtqueue *vq, int n)
-{
-	vq->last_avail_idx -= n;
-}
-EXPORT_SYMBOL_GPL(vhost_discard_vq_desc);
-
-/* After we've used one of their buffers, we tell them about it.  We'll then
- * want to notify the guest, using eventfd. */
-int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len)
-{
-	struct vring_used_elem heads = {
-		cpu_to_vhost32(vq, head),
-		cpu_to_vhost32(vq, len)
-	};
-
-	return vhost_add_used_n(vq, &heads, 1);
-}
-EXPORT_SYMBOL_GPL(vhost_add_used);
-
 static int __vhost_add_used_n(struct vhost_virtqueue *vq,
 			    struct vring_used_elem *heads,
 			    unsigned count)
@@ -2502,6 +2489,19 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads,
 }
 EXPORT_SYMBOL_GPL(vhost_add_used_n);
 
+/* After we've used one of their buffers, we tell them about it.  We'll then
+ * want to notify the guest, using eventfd. */
+int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len)
+{
+	struct vring_used_elem heads = {
+		cpu_to_vhost32(vq, head),
+		cpu_to_vhost32(vq, len)
+	};
+
+	return vhost_add_used_n(vq, &heads, 1);
+}
+EXPORT_SYMBOL_GPL(vhost_add_used);
+
 static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)
 {
 	__u16 old, new;
-- 
MST

  parent reply	other threads:[~2020-06-07 14:11 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-07 14:11 [PATCH RFC v5 00/13] vhost: ring format independence Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 01/13] vhost: option to fetch descriptors through an independent struct Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 02/13] vhost: use batched version by default Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 03/13] vhost: batching fetches Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 04/13] vhost: cleanup fetch_buf return code handling Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 05/13] vhost/net: pass net specific struct pointer Michael S. Tsirkin
2020-06-07 14:11 ` Michael S. Tsirkin [this message]
2020-06-07 14:11 ` [PATCH RFC v5 07/13] vhost: format-independent API for used buffers Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 08/13] vhost/net: convert to new API: heads->bufs Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 09/13] vhost/net: avoid iov length math Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 10/13] vhost/test: convert to the buf API Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 11/13] vhost/scsi: switch to buf APIs Michael S. Tsirkin
2020-06-08  9:57   ` Stefan Hajnoczi
2020-06-07 14:11 ` [PATCH RFC v5 12/13] vhost/vsock: switch to the buf API Michael S. Tsirkin
2020-06-08  9:57   ` Stefan Hajnoczi
2020-06-08 10:17   ` Stefano Garzarella
2020-06-08 13:30     ` Michael S. Tsirkin
2020-06-08 16:26       ` Stefano Garzarella
2020-06-07 14:11 ` [PATCH RFC v5 13/13] vhost: drop head based APIs Michael S. Tsirkin
2020-06-08  3:57   ` Jason Wang
2020-06-08  6:45     ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200607141057.704085-7-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=eperezma@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).