[Qemu-devel] [PATCH 1/2] dataplane: move vring_more_avail() into vring.c

[Stefan Hajnoczi]

vring_more_avail() was an inline function in vring.h.  No external
callers use it so it's not necessary to export it.

Furthermore, we'll need virtio-access.h for endian-aware memory accesses
but that only works in per-target object files (obj-y) and not
build-once object files (common-obj-y) like the virtio-blk and
virtio-scsi devices.

Move vring_more_avail() into vring.c so that virtio devices like
virtio-blk and virtio-scsi can continue to use vring.h without being
built once per target.

Signed-off-by: Stefan Hajnoczi <address@hidden>
---
 hw/virtio/dataplane/vring.c         | 6 ++++++
 include/hw/virtio/dataplane/vring.h | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index 61f6d83..cb31d7f 100644
--- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -21,6 +21,12 @@
 #include "hw/virtio/dataplane/vring.h"
 #include "qemu/error-report.h"
 
+/* Are there more descriptors available? */
+static inline bool vring_more_avail(Vring *vring)
+{
+    return vring->vr.avail->idx != vring->last_avail_idx;
+}
+
 /* vring_map can be coupled with vring_unmap or (if you still have the
  * value returned in *mr) memory_region_unref.
  */
diff --git a/include/hw/virtio/dataplane/vring.h 
b/include/hw/virtio/dataplane/vring.h
index d3e086a..1e871e6 100644
--- a/include/hw/virtio/dataplane/vring.h
+++ b/include/hw/virtio/dataplane/vring.h
@@ -36,12 +36,6 @@ static inline unsigned int vring_get_num(Vring *vring)
     return vring->vr.num;
 }
 
-/* Are there more descriptors available? */
-static inline bool vring_more_avail(Vring *vring)
-{
-    return vring->vr.avail->idx != vring->last_avail_idx;
-}
-
 /* Fail future vring_pop() and vring_push() calls until reset */
 static inline void vring_set_broken(Vring *vring)
 {
-- 
2.1.0