diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xentools33/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xentools33/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-blktaplib_h | 13 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-io_ring_h | 17 |
4 files changed, 35 insertions, 3 deletions
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index 56ad13e49ad..2134295d6f2 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.27 2011/10/03 17:01:24 sborrill Exp $ +# $NetBSD: Makefile,v 1.28 2012/01/09 14:06:34 cegger Exp $ # VERSION= 3.3.2 DISTNAME= xen-${VERSION} PKGNAME= xentools33-${VERSION} -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo index 5e4c5b58340..f708617548d 100644 --- a/sysutils/xentools33/distinfo +++ b/sysutils/xentools33/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2011/12/07 15:22:59 joerg Exp $ +$NetBSD: distinfo,v 1.26 2012/01/09 14:06:34 cegger Exp $ SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b @@ -27,6 +27,7 @@ SHA1 (patch-bh) = a072c1e2dd21aa284303b5fcc7eae5ff841a5fbc SHA1 (patch-bi) = 49c1b77b451b63cfe3a1fded7f6d0410d4c3cf92 SHA1 (patch-bj) = 4c6b6a73d3ea5fb2c57b12dd4651f59024119276 SHA1 (patch-bk) = a79256edc3dc2a5f4bcdbe1a2d14037ad74f11de +SHA1 (patch-blktaplib_h) = a37ecaaefcd694be54bb75163339650be69f9250 SHA1 (patch-ca) = b62ec8f0db5e65d737d1aaf3bd44580f5969328b SHA1 (patch-cb) = 9b7834e367a1820f28c0c1053d3f351751a12283 SHA1 (patch-cc) = 598f7cda0e3137188f97605037b0b1c26ae8d0c0 @@ -54,4 +55,5 @@ SHA1 (patch-fd) = 619b865b2f17814e6e62ebab21de9183474dd075 SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3 SHA1 (patch-ff) = 6ff97fa4f34f29c276e4aaab4b4db9ccf7b09957 SHA1 (patch-fg) = 913295d341c1dd5bf4d1ef78f27520920f138d4c +SHA1 (patch-io_ring_h) = 83b01462d5d2b48b4f97b3d9a7980aa3300ad0b3 SHA1 (patch-qemu-phy-devices) = 29790e45372ae16157e906dc39a667229e8a0ba5 diff --git a/sysutils/xentools33/patches/patch-blktaplib_h b/sysutils/xentools33/patches/patch-blktaplib_h new file mode 100644 index 00000000000..f252644f19e --- /dev/null +++ b/sysutils/xentools33/patches/patch-blktaplib_h @@ -0,0 +1,13 @@ +$NetBSD: patch-blktaplib_h,v 1.1 2012/01/09 14:06:34 cegger Exp $ + +--- blktap/lib/blktaplib.h.orig 2009-08-06 12:56:32.000000000 +0000 ++++ blktap/lib/blktaplib.h +@@ -42,7 +42,7 @@ + #include <sys/types.h> + #include <unistd.h> + +-#define BLK_RING_SIZE __RING_SIZE((blkif_sring_t *)0, XC_PAGE_SIZE) ++#define BLK_RING_SIZE __CONST_RING_SIZE(blkif, XC_PAGE_SIZE) + + /* size of the extra VMA area to map in attached pages. */ + #define BLKTAP_VMA_PAGES BLK_RING_SIZE diff --git a/sysutils/xentools33/patches/patch-io_ring_h b/sysutils/xentools33/patches/patch-io_ring_h new file mode 100644 index 00000000000..b76e9f80a64 --- /dev/null +++ b/sysutils/xentools33/patches/patch-io_ring_h @@ -0,0 +1,17 @@ +$NetBSD: patch-io_ring_h,v 1.1 2012/01/09 14:06:34 cegger Exp $ + +--- ../xen/include/public/io/ring.h.orig 2009-08-06 12:56:43.000000000 +0000 ++++ ../xen/include/public/io/ring.h +@@ -50,6 +50,12 @@ typedef unsigned int RING_IDX; + * A ring contains as many entries as will fit, rounded down to the nearest + * power of two (so we can mask with (size-1) to loop around). + */ ++#define __CONST_RING_SIZE(_s, _sz) \ ++ (__RD32(((_sz) - offsetof(struct _s##_sring, ring)) / \ ++ sizeof(((struct _s##_sring *)0)->ring[0]))) ++/* ++ * The same for passing in an actual pointer instead of a name tag. ++ */ + #define __RING_SIZE(_s, _sz) \ + (__RD32(((_sz) - (long)(_s)->ring + (long)(_s)) / sizeof((_s)->ring[0]))) + |