Skip to contentSkip to conversation

virtio: rename 'pagesize' arg to vring_init/vring_size

PATCH New Rusty Russell 1 participant 1 message Nov 12, 2008

Subsystems (2)
KVM virtio core
lore
Share & tools
lore

Rusty Russell

author
#0 lore raw

PATCH 2/7 virtio: rename 'pagesize' arg to vring_init/vring_size

It's really the alignment desired for consumer/producer separation; historically this x86 pagesize, but with PowerPC it'll still be x86 pagesize. And in theory lguest could choose a different value.

Signed-off-by Rusty Russell <[email protected]>
---
 include/linux/virtio_ring.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/virtio_ring.h +6 -6
diff -r c6761450d706 include/linux/virtio_ring.h
@@ -83,7 +83,7 @@
  *	__u16 avail_idx;
  *	__u16 available[num];
  *
- *	// Padding to the next page boundary.
+ *	// Padding to the next align boundary.
  *	char pad[];
  *
  *	// A ring of used descriptor heads with free-running index.

@@ -93,19 +93,19 @@
  * };
  */
 static inline void vring_init(struct vring *vr, unsigned int num, void *p,
-			      unsigned long pagesize)
+			      unsigned long align)
 {
 	vr->num = num;
 	vr->desc = p;
 	vr->avail = p + num*sizeof(struct vring_desc);
-	vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + pagesize-1)
-			    & ~(pagesize - 1));
+	vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + align-1)
+			    & ~(align - 1));
 }
 
-static inline unsigned vring_size(unsigned int num, unsigned long pagesize)
+static inline unsigned vring_size(unsigned int num, unsigned long align)
 {
 	return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (2 + num)
-		 + pagesize - 1) & ~(pagesize - 1))
+		 + align - 1) & ~(align - 1))
 		+ sizeof(__u16) * 2 + sizeof(struct vring_used_elem) * num;
 }