[Virtio-for-kvm] [PATCH 9/13] [Mostly resend] virtio additions

[Virtio-for-kvm] [PATCH 9/13] [Mostly resend] virtio additions

[Dor Laor]

 From e761e0d22af833c9d0d48f191f38fc25f6a5f753 Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Date: Fri, 21 Dec 2007 02:17:47 +0200
Subject: [PATCH] Fix vring_init/vring_size to take unsigned long

Using unsigned int resulted in silent truncation of the upper 32-bit on 
x86_64
resulting in an OOPS since the ring was being initialized wrong.

Please reconsider my previous patch to just use PAGE_ALIGN().  Open 
coding this
sort of stuff, no matter how simple it seems, is just asking for this 
sort of
trouble.

Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 include/linux/virtio_ring.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 1a4ed49..5de09f9 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -89,7 +89,7 @@ struct vring {
  * };
  */
 static inline void vring_init(struct vring *vr, unsigned int num, void *p,
-                  unsigned int pagesize)
+                  unsigned long pagesize)
 {
     vr->num = num;
     vr->desc = p;
@@ -98,7 +98,7 @@ static inline void vring_init(struct vring *vr, 
unsigned int num, void *p,
                 & ~(pagesize - 1));
 }
 
-static inline unsigned vring_size(unsigned int num, unsigned int pagesize)
+static inline unsigned vring_size(unsigned int num, unsigned long pagesize)
 {
     return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (2 + num)
          + pagesize - 1) & ~(pagesize - 1))
-- 
1.5.3.3


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/