[pkgsrc/trunk]: pkgsrc xentools20: switch to use the new version of IOCTL_PRI...

[yamt <yamt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/feff082f6ce1
branches:  trunk
changeset: 495199:feff082f6ce1
user:      yamt <yamt%pkgsrc.org@localhost>
date:      Sat Jun 04 11:34:30 2005 +0000

description:
xentools20: switch to use the new version of IOCTL_PRIVCMD_INITDOMAIN_EVTCHN.
bump PKGREVISION to nb1.

diffstat:

 doc/CHANGES                          |   3 ++-
 sysutils/xentools20/Makefile         |   3 ++-
 sysutils/xentools20/distinfo         |   4 ++--
 sysutils/xentools20/files/xenio.h    |  24 ++++++++++++++++--------
 sysutils/xentools20/patches/patch-ac |   6 +++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diffs (110 lines):

diff -r bac3a3a2a314 -r feff082f6ce1 doc/CHANGES
--- a/doc/CHANGES       Sat Jun 04 11:20:22 2005 +0000
+++ b/doc/CHANGES       Sat Jun 04 11:34:30 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10291 2005/06/04 11:19:30 wiz Exp $
+$NetBSD: CHANGES,v 1.10292 2005/06/04 11:34:30 yamt Exp $
 
 Changes to the packages collection and infrastructure in 2005:
        
@@ -2781,3 +2781,4 @@
        Moved graphics/swfdec-gtk2 to multimedia/swfdec-gtk2 [jmmv 2005-06-04]
        Updated textproc/glimpse to 4.18.0 [wiz 2005-06-04]
        Added games/liquidwar version 5.6.2 [wiz 2005-06-04]
+       Updated sysutils/xentools20 to 2.0.6nb1 [yamt 2005-06-04]
diff -r bac3a3a2a314 -r feff082f6ce1 sysutils/xentools20/Makefile
--- a/sysutils/xentools20/Makefile      Sat Jun 04 11:20:22 2005 +0000
+++ b/sysutils/xentools20/Makefile      Sat Jun 04 11:34:30 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/05/24 16:02:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/04 11:34:30 yamt Exp $
 #
 
 DISTNAME=              xen-2.0.6-src
 PKGNAME=               xentools20-2.0.6
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/
 EXTRACT_SUFX=          .tgz
diff -r bac3a3a2a314 -r feff082f6ce1 sysutils/xentools20/distinfo
--- a/sysutils/xentools20/distinfo      Sat Jun 04 11:20:22 2005 +0000
+++ b/sysutils/xentools20/distinfo      Sat Jun 04 11:34:30 2005 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/05/24 16:02:08 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2005/06/04 11:34:30 yamt Exp $
 
 SHA1 (xen-2.0.6-src.tgz) = 3808b8ff57decc3dea0c65c5a80665516a000487
 RMD160 (xen-2.0.6-src.tgz) = ebcdd95e3c74fb71bf732ff04694abe4fe3b6876
 Size (xen-2.0.6-src.tgz) = 2456215 bytes
 SHA1 (patch-aa) = 2c3ca679003895f19f11dcd5038dbfa2de241a74
 SHA1 (patch-ab) = 876bcc0723ff7e12e096ca1bff749f8a2ff23b16
-SHA1 (patch-ac) = a07e37a56a6d0cb8cd51b24e82a48a7bef91d233
+SHA1 (patch-ac) = 24acf3f7c71addc24e8f32270173fb4ace1e9180
 SHA1 (patch-ad) = 6f242d6ad89b4c019cd291313ba8eaa28ae3bfbb
 SHA1 (patch-ae) = b5a6521b14dd24cb52713bd83ec91422ef63161e
 SHA1 (patch-af) = 5467e64fbd49d6ca35718d42864ed7b44fe76df3
diff -r bac3a3a2a314 -r feff082f6ce1 sysutils/xentools20/files/xenio.h
--- a/sysutils/xentools20/files/xenio.h Sat Jun 04 11:20:22 2005 +0000
+++ b/sysutils/xentools20/files/xenio.h Sat Jun 04 11:34:30 2005 +0000
@@ -1,3 +1,5 @@
+/*     NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $    */
+
 /******************************************************************************
  * privcmd.h
  * 
@@ -70,6 +72,19 @@
 #define IOCTL_PRIVCMD_HYPERCALL         \
     _IOWR('P', 0, privcmd_hypercall_t)
 
+#if defined(_KERNEL)
+/* compat */
+#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN_OLD \
+    _IO('P', 1)
+#endif /* defined(_KERNEL) */
+    
+#define IOCTL_PRIVCMD_MMAP             \
+    _IOW('P', 2, privcmd_mmap_t)
+#define IOCTL_PRIVCMD_MMAPBATCH        \
+    _IOW('P', 3, privcmd_mmapbatch_t)
+#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \
+    _IOW('P', 4, unsigned long)
+
 /*
  * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN
  * @arg: n/a
@@ -77,14 +92,7 @@
  *         for the initial domain.
  */
 #define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \
-    _IO('P', 1)
-    
-#define IOCTL_PRIVCMD_MMAP             \
-    _IOW('P', 2, privcmd_mmap_t)
-#define IOCTL_PRIVCMD_MMAPBATCH        \
-    _IOW('P', 3, privcmd_mmapbatch_t)
-#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \
-    _IOW('P', 4, unsigned long)
+    _IOR('P', 5, int)
 
 /* Interface to /dev/xenevt */
 /* EVTCHN_RESET: Clear and reinit the event buffer. Clear error condition. */
diff -r bac3a3a2a314 -r feff082f6ce1 sysutils/xentools20/patches/patch-ac
--- a/sysutils/xentools20/patches/patch-ac      Sat Jun 04 11:20:22 2005 +0000
+++ b/sysutils/xentools20/patches/patch-ac      Sat Jun 04 11:34:30 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-ac,v 1.2 2005/06/04 11:34:30 yamt Exp $
 
 --- python/xen/lowlevel/xu/xu.c.orig   2005-01-12 13:22:21.000000000 +0100
 +++ python/xen/lowlevel/xu/xu.c        2005-02-05 20:22:08.000000000 +0100
@@ -101,8 +101,8 @@
           * We use an ioctl to discover the port at our end of the channel.
           */
 -        port1 = ioctl(xup->xc_handle, IOCTL_PRIVCMD_INITDOMAIN_EVTCHN, NULL);
-+        (void)ioctl(xup->xc_handle, IOCTL_PRIVCMD_INITDOMAIN_EVTCHN, NULL);
-+      port1 = errno;
++        if (ioctl(xup->xc_handle, IOCTL_PRIVCMD_INITDOMAIN_EVTCHN, &port1))
++            port1 = -1;
          port2 = -1; /* We don't need the remote end of the DOM0 link. */
          if ( port1 < 0 )
          {