From a984eb367c032dbe2577f01238c3d1268526be70 Mon Sep 17 00:00:00 2001 From: Kacper Date: Thu, 25 Dec 2025 19:24:38 +0100 Subject: Clang-tidy fixes --- include/arch/x86_64/linux/virtio_ring.h | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'include/arch/x86_64/linux/virtio_ring.h') diff --git a/include/arch/x86_64/linux/virtio_ring.h b/include/arch/x86_64/linux/virtio_ring.h index 0af526a6..4caf041d 100644 --- a/include/arch/x86_64/linux/virtio_ring.h +++ b/include/arch/x86_64/linux/virtio_ring.h @@ -123,8 +123,7 @@ struct vring_used_elem { __virtio32 len; }; -typedef struct vring_used_elem - __attribute__((aligned(VRING_USED_ALIGN_SIZE))) vring_used_elem_t; +typedef struct vring_used_elem __attribute__((aligned(VRING_USED_ALIGN_SIZE))) vring_used_elem_t; struct vring_used { __virtio16 flags; @@ -146,12 +145,9 @@ struct vring_used { * can both increase and decrease alignment, and specifying the packed * attribute generates a warning. */ -typedef struct vring_desc - __attribute__((aligned(VRING_DESC_ALIGN_SIZE))) vring_desc_t; -typedef struct vring_avail - __attribute__((aligned(VRING_AVAIL_ALIGN_SIZE))) vring_avail_t; -typedef struct vring_used - __attribute__((aligned(VRING_USED_ALIGN_SIZE))) vring_used_t; +typedef struct vring_desc __attribute__((aligned(VRING_DESC_ALIGN_SIZE))) vring_desc_t; +typedef struct vring_avail __attribute__((aligned(VRING_AVAIL_ALIGN_SIZE))) vring_avail_t; +typedef struct vring_used __attribute__((aligned(VRING_USED_ALIGN_SIZE))) vring_used_t; struct vring { unsigned int num; @@ -194,23 +190,17 @@ struct vring { #define vring_used_event(vr) ((vr)->avail->ring[(vr)->num]) #define vring_avail_event(vr) (*(__virtio16 *)&(vr)->used->ring[(vr)->num]) -static __inline__ void vring_init(struct vring *vr, unsigned int num, void *p, - unsigned long align) +static __inline__ void vring_init(struct vring *vr, unsigned int num, void *p, unsigned long align) { vr->num = num; vr->desc = p; - vr->avail = (struct vring_avail *)((char *)p + - num * sizeof(struct vring_desc)); - vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + - sizeof(__virtio16) + align - 1) & - ~(align - 1)); + vr->avail = (struct vring_avail *)((char *)p + num * sizeof(struct vring_desc)); + vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16) + align - 1) & ~(align - 1)); } static __inline__ unsigned vring_size(unsigned int num, unsigned long align) { - return ((sizeof(struct vring_desc) * num + - sizeof(__virtio16) * (3 + num) + align - 1) & - ~(align - 1)) + + return ((sizeof(struct vring_desc) * num + sizeof(__virtio16) * (3 + num) + align - 1) & ~(align - 1)) + sizeof(__virtio16) * 3 + sizeof(struct vring_used_elem) * num; } @@ -220,8 +210,7 @@ static __inline__ unsigned vring_size(unsigned int num, unsigned long align) /* Assuming a given event_idx value from the other side, if * we have just incremented index from old to new_idx, * should we trigger an event? */ -static __inline__ int vring_need_event(__u16 event_idx, __u16 new_idx, - __u16 old) +static __inline__ int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) { /* Note: Xen has similar logic for notification hold-off * in include/xen/interface/io/ring.h with req_event and req_prod -- cgit v1.2.3