[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 11/12] hw/virtio: Have vring_avail_flags() return a boolean v
From: |
Philippe Mathieu-Daudé |
Subject: |
[RFC PATCH 11/12] hw/virtio: Have vring_avail_flags() return a boolean value |
Date: |
Thu, 20 May 2021 13:09:18 +0200 |
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 --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;
--
2.26.3
- [RFC PATCH 02/12] exec/memattrs: Add attribute/error for address alignment, (continued)
- [RFC PATCH 02/12] exec/memattrs: Add attribute/error for address alignment, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 03/12] exec/memory_ldst: Return MEMTX_UNALIGNED_ERROR for unaligned addresses, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 04/12] exec/memory_ldst_cached: Sort declarations, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 05/12] exec/memory_ldst_cached: Use correct type size, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 06/12] exec/memory_ldst_cached: Set MemTxResult on success, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 07/12] exec/memory_ldst_cached: Document aligned addresses are expected, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 08/12] exec/memory_ldst_cached: Check address alignment if requested, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 09/12] hw/virtio: Use correct type sizes, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 10/12] hw/virtio: Extract virtio_lduw_phys_cached_with_attrs(), Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 12/12] hw/virtio: Display error if vring flag field is not aligned, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 11/12] hw/virtio: Have vring_avail_flags() return a boolean value,
Philippe Mathieu-Daudé <=
- Re: [RFC PATCH 00/12] exec/memory: Experimental API to catch unaligned accesses, Philippe Mathieu-Daudé, 2021/05/31