diff options
| author | yamt <yamt@pkgsrc.org> | 2005-06-04 11:34:30 +0000 |
|---|---|---|
| committer | yamt <yamt@pkgsrc.org> | 2005-06-04 11:34:30 +0000 |
| commit | 04f9c3bf5b7e8f10b2fb03e781696bb9ec01d536 (patch) | |
| tree | 03992fa5644ec9a5e08e56c9256927bdd24fda33 /sysutils/xentools20 | |
| parent | f1eb6cf2841f5650557ff51bdc3a3ab3b821c05e (diff) | |
| download | pkgsrc-04f9c3bf5b7e8f10b2fb03e781696bb9ec01d536.tar.gz | |
xentools20: switch to use the new version of IOCTL_PRIVCMD_INITDOMAIN_EVTCHN.
bump PKGREVISION to nb1.
Diffstat (limited to 'sysutils/xentools20')
| -rw-r--r-- | sysutils/xentools20/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/xentools20/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xentools20/files/xenio.h | 22 | ||||
| -rw-r--r-- | sysutils/xentools20/patches/patch-ac | 6 |
4 files changed, 22 insertions, 13 deletions
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile index fddeec8da74..58361884e5b 100644 --- a/sysutils/xentools20/Makefile +++ b/sysutils/xentools20/Makefile @@ -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 --git a/sysutils/xentools20/distinfo b/sysutils/xentools20/distinfo index 117fe78828a..28579f74535 100644 --- a/sysutils/xentools20/distinfo +++ b/sysutils/xentools20/distinfo @@ -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 --git a/sysutils/xentools20/files/xenio.h b/sysutils/xentools20/files/xenio.h index 688f2db8772..2f2d91f4289 100644 --- a/sysutils/xentools20/files/xenio.h +++ b/sysutils/xentools20/files/xenio.h @@ -1,3 +1,5 @@ +/* NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $ */ + /****************************************************************************** * privcmd.h * @@ -70,14 +72,11 @@ typedef struct privcmd_blkmsg #define IOCTL_PRIVCMD_HYPERCALL \ _IOWR('P', 0, privcmd_hypercall_t) -/* - * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN - * @arg: n/a - * Return: Port associated with domain-controller end of control event channel - * for the initial domain. - */ -#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \ +#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) @@ -86,6 +85,15 @@ typedef struct privcmd_blkmsg #define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \ _IOW('P', 4, unsigned long) +/* + * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN + * @arg: n/a + * Return: Port associated with domain-controller end of control event channel + * for the initial domain. + */ +#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \ + _IOR('P', 5, int) + /* Interface to /dev/xenevt */ /* EVTCHN_RESET: Clear and reinit the event buffer. Clear error condition. */ #define EVTCHN_RESET _IO('E', 1) diff --git a/sysutils/xentools20/patches/patch-ac b/sysutils/xentools20/patches/patch-ac index bd85171c870..fb25116a8e9 100644 --- a/sysutils/xentools20/patches/patch-ac +++ b/sysutils/xentools20/patches/patch-ac @@ -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 @@ $NetBSD: patch-ac,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $ * 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 ) { |