diff mbox series

[RFC,11/12] hw/virtio: Have vring_avail_flags() return a boolean value

Message ID 20210520110919.2483190-12-philmd@redhat.com (mailing list archive)
State New, archived
Headers show
Series exec/memory: Experimental API to catch unaligned accesses | expand

Commit Message

Philippe Mathieu-Daudé May 20, 2021, 11:09 a.m. UTC
To be able to check the memory transaction succeeded, change
the vring_avail_flags() to take the value to read by argument,
so we can return a boolean whether we succeeded or not.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/virtio/virtio.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index e02544b2df7..1b8bc194ce1 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -287,16 +287,19 @@  static VRingMemoryRegionCaches *vring_get_region_caches(struct VirtQueue *vq)
 }
 
 /* Called within rcu_read_lock().  */
-static inline uint16_t vring_avail_flags(VirtQueue *vq)
+static inline bool vring_avail_flags(VirtQueue *vq, uint16_t *val)
 {
     VRingMemoryRegionCaches *caches = vring_get_region_caches(vq);
     hwaddr pa = offsetof(VRingAvail, flags);
 
     if (!caches) {
-        return 0;
+        *val = 0;
+        return true;
     }
 
-    return virtio_lduw_phys_cached(vq->vdev, &caches->avail, pa);
+    *val = virtio_lduw_phys_cached_with_attrs(vq->vdev, &caches->avail, pa);
+
+    return true;
 }
 
 /* Called within rcu_read_lock().  */
@@ -2462,7 +2465,9 @@  static bool virtio_split_should_notify(VirtIODevice *vdev, VirtQueue *vq)
     }
 
     if (!virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
-        return !(vring_avail_flags(vq) & VRING_AVAIL_F_NO_INTERRUPT);
+        uint16_t flags;
+        return vring_avail_flags(vq, &flags)
+               && !(flags & VRING_AVAIL_F_NO_INTERRUPT);
     }
 
     v = vq->signalled_used_valid;