diff options
83 files changed, 4 insertions, 3759 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 01d51902a81..3939bf39b8f 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.403 2007/06/08 20:22:00 heinz Exp $ +# $NetBSD: Makefile,v 1.404 2007/06/14 19:44:41 bouyer Exp $ # COMMENT= System utilities @@ -321,11 +321,11 @@ SUBDIR+= xdu SUBDIR+= xen12 SUBDIR+= xenconsole SUBDIR+= xenkernel20 -SUBDIR+= xenkernel30 +SUBDIR+= xenkernel3 SUBDIR+= xentools12 SUBDIR+= xentools20 -SUBDIR+= xentools30 -SUBDIR+= xentools30-hvm +SUBDIR+= xentools3 +SUBDIR+= xentools3-hvm SUBDIR+= xenvstat SUBDIR+= xfce4-appfinder SUBDIR+= xfce4-battery-plugin diff --git a/sysutils/xenkernel30/DESCR b/sysutils/xenkernel30/DESCR deleted file mode 100644 index b200f6ee961..00000000000 --- a/sysutils/xenkernel30/DESCR +++ /dev/null @@ -1,11 +0,0 @@ -Xen is a virtual machine monitor for x86 hardware (runs only on -i686-class CPUs), which supports running multiple guests operating -systems on a single machine. Guest OSes (also called "domains") -require a modified kernel which supports Xen hypercalls in replacement -to access to the physical hardware. At boot, the xen kernel is loaded -(via grub) along with the guest kernel for the first domain (called -domain0). domain0 has privileges to access the physical hardware (PCI -and ISA devices), administrate other domains and provide virtual -devices (disks and network) to other domains. - -This package contains the Xen3 kernel itself. diff --git a/sysutils/xenkernel30/Makefile b/sysutils/xenkernel30/Makefile deleted file mode 100644 index 162474bcc29..00000000000 --- a/sysutils/xenkernel30/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2007/04/28 17:14:49 bouyer Exp $ -# - -DISTNAME= xen-3.0.4_1-install-x86_32 -PKGNAME= xenkernel30-3.0.4 -CATEGORIES= sysutils -MASTER_SITES= http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/ \ - http://bits.xensource.com/oss-xen/release/3.0.4-1/bin.tgz/ -EXTRACT_SUFX= .tgz - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.NetBSD.org/Ports/xen/ -COMMENT= Xen3 Kernel - -WRKSRC= ${WRKDIR}/dist - -NO_CONFIGURE= yes -NO_BUILD= yes - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/xen3-kernel - ${INSTALL_DATA} ${WRKSRC}/install/boot/xen.gz ${PREFIX}/xen3-kernel/xen.gz - -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xenkernel30/PLIST b/sysutils/xenkernel30/PLIST deleted file mode 100644 index 456e93314a4..00000000000 --- a/sysutils/xenkernel30/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/03 07:28:22 agc Exp $ -xen3-kernel/xen.gz -@dirrm xen3-kernel diff --git a/sysutils/xenkernel30/distinfo b/sysutils/xenkernel30/distinfo deleted file mode 100644 index 51424d4b50c..00000000000 --- a/sysutils/xenkernel30/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.3 2007/04/28 17:14:50 bouyer Exp $ - -SHA1 (xen-3.0.4_1-install-x86_32.tgz) = bf8eb7c0a4c510b4010505ea6f849893896fc556 -RMD160 (xen-3.0.4_1-install-x86_32.tgz) = c3c37d673d8a14e719a35ed1b8c84492614fe9d0 -Size (xen-3.0.4_1-install-x86_32.tgz) = 21490373 bytes diff --git a/sysutils/xentools30-hvm/DESCR b/sysutils/xentools30-hvm/DESCR deleted file mode 100644 index 8b7d41362d4..00000000000 --- a/sysutils/xentools30-hvm/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -The Xen virtual machine monitor allows running several virtual machines -on a single physical machine. The xentools30-vmx package contains -additionnal tools to xentools30 to run unmodified guests using the -Intel VT or AMD VMX extentions. diff --git a/sysutils/xentools30-hvm/Makefile b/sysutils/xentools30-hvm/Makefile deleted file mode 100644 index a239d483a0d..00000000000 --- a/sysutils/xentools30-hvm/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2007/04/28 17:14:53 bouyer Exp $ -# - -DISTNAME= xen-3.0.4_1-src -PKGNAME= xentools30-hvm-3.0.4 -PKGREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \ - http://bits.xensource.com/oss-xen/release/3.0.4-1/src.tgz/ -EXTRACT_SUFX= .tgz - -MAINTAINER= bouyer@NetBSD.org -HOMEPAGE= http://www.cl.cam.ac.uk/research/srg/netos/xen/ -COMMENT= Tools for Virtual Machine Extensions support in Xen - -BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware - -PKG_SYSCONFSUBDIR= xen - -ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 - -CONFLICTS+= libxen-[0-9]* -CONFLICTS+= xentools20-[0-9]* - -WRKSRC= ${WRKDIR}/xen-3.0.4_1-src/tools -CHECK_PORTABILITY_SKIP+= examples/* - -EGDIR= ${PREFIX}/share/examples/xen -MESSAGE_SUBST= EGDIR=${EGDIR} - -USE_TOOLS+= perl -USE_TOOLS+= gmake -MAKE_ENV+= EGDIR=${EGDIR:Q} -MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} -MAKE_ENV+= XEN_TARGET_ARCH="x86_32" -PYTHON_VERSIONS_ACCEPTED= 24 23 - -SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= ioemu/vl.c -SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g" -SUBST_MESSAGE.paths= Fixing hardcoded paths. - -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_FILES.conf= ioemu/configure -SUBST_FILES.conf+= ioemu/vl.c -SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" - -SUBST_CLASSES+= prefix -SUBST_STAGE.prefix= pre-configure -SUBST_FILES.prefix= python/xen/util/auxbin.py -SUBST_FILES.prefix= ioemu/vl.c -SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},g" - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -PROCPATH= /kern -.else -PROCPATH= /proc -.endif - -pre-build: - ${MKDIR} ${WRKSRC}/libxc/xen/NetBSD - ${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio.h || ${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen/NetBSD - ${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio3.h || ${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen/NetBSD - ${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/ - -.if ${OPSYS} == "NetBSD" -post-build: - cd ${FILESDIR}; for src in *-nbsd; do \ - dst="$${src%-nbsd}"; \ - ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ - -e "s|@PREFIX@|${PREFIX}|g" \ - $$src > ${WRKSRC}/examples/$$dst; \ - done -.endif - -post-install: - for f in hvm; do \ - ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${EGDIR}/$$f; \ - done - -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/SDL/buildlink3.mk" -.include "../../sysutils/xentools30/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xentools30-hvm/PLIST b/sysutils/xentools30-hvm/PLIST deleted file mode 100644 index 427d7ff044a..00000000000 --- a/sysutils/xentools30-hvm/PLIST +++ /dev/null @@ -1,44 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ -lib/xen/boot/hvmloader -libexec/qemu-dm -share/examples/xen/hvm -share/xen/qemu/keymaps/ar -share/xen/qemu/keymaps/common -share/xen/qemu/keymaps/da -share/xen/qemu/keymaps/de -share/xen/qemu/keymaps/de-ch -share/xen/qemu/keymaps/en-gb -share/xen/qemu/keymaps/en-us -share/xen/qemu/keymaps/es -share/xen/qemu/keymaps/et -share/xen/qemu/keymaps/fi -share/xen/qemu/keymaps/fo -share/xen/qemu/keymaps/fr -share/xen/qemu/keymaps/fr-be -share/xen/qemu/keymaps/fr-ca -share/xen/qemu/keymaps/fr-ch -share/xen/qemu/keymaps/hr -share/xen/qemu/keymaps/hu -share/xen/qemu/keymaps/is -share/xen/qemu/keymaps/it -share/xen/qemu/keymaps/ja -share/xen/qemu/keymaps/lt -share/xen/qemu/keymaps/lv -share/xen/qemu/keymaps/mk -share/xen/qemu/keymaps/modifiers -share/xen/qemu/keymaps/nl -share/xen/qemu/keymaps/nl-be -share/xen/qemu/keymaps/no -share/xen/qemu/keymaps/pl -share/xen/qemu/keymaps/pt -share/xen/qemu/keymaps/pt-br -share/xen/qemu/keymaps/ru -share/xen/qemu/keymaps/sl -share/xen/qemu/keymaps/sv -share/xen/qemu/keymaps/th -share/xen/qemu/keymaps/tr -@dirrm lib/xen/boot -@dirrm lib/xen -@dirrm share/xen/qemu/keymaps -@dirrm share/xen/qemu -@dirrm share/xen diff --git a/sysutils/xentools30-hvm/distinfo b/sysutils/xentools30-hvm/distinfo deleted file mode 100644 index 8dcadfe921c..00000000000 --- a/sysutils/xentools30-hvm/distinfo +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: distinfo,v 1.3 2007/04/28 17:14:53 bouyer Exp $ - -SHA1 (xen-3.0.4_1-src.tgz) = 7ca5af70996215229e143c7563e69b3719284a95 -RMD160 (xen-3.0.4_1-src.tgz) = f869eec35f6afe0bc9824ce2eb4a600f789d423b -Size (xen-3.0.4_1-src.tgz) = 6473636 bytes -SHA1 (patch-aa) = 6f953f5033860e4e14f73f72b28f59e0e29f3bb5 -SHA1 (patch-an) = ab9fa15be2a4caf84d78ca72463d02f1d2939a3f -SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998 -SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c -SHA1 (patch-ar) = c45d8e7c34268f95f5dff0164adf093e52aa2950 -SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5 -SHA1 (patch-at) = 2311289176c83fcd3ff18b90bab9c2e5e05a52f1 -SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b -SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373 -SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a -SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713 -SHA1 (patch-ay) = cdfaa8d4a1720711261b476e5c046a778eaf27f2 -SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6 -SHA1 (patch-bb) = 19e3d323efab335a50f0410d1197ecbee5b7798b -SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a -SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577 diff --git a/sysutils/xentools30-hvm/files/NetBSD.mk b/sysutils/xentools30-hvm/files/NetBSD.mk deleted file mode 100644 index 03b3360db79..00000000000 --- a/sysutils/xentools30-hvm/files/NetBSD.mk +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: NetBSD.mk,v 1.1 2007/04/28 17:14:54 bouyer Exp $ -include $(XEN_ROOT)/config/StdGNU.mk diff --git a/sysutils/xentools30-hvm/files/hvm-nbsd b/sysutils/xentools30-hvm/files/hvm-nbsd deleted file mode 100644 index b6aa1b5d498..00000000000 --- a/sysutils/xentools30-hvm/files/hvm-nbsd +++ /dev/null @@ -1,68 +0,0 @@ -#============================================================================ -# Python configuration setup for 'xm create'. -# This script sets the parameters used when a domain is created using 'xm create'. -# You use a separate script for each domain you want to create, or -# you can set the parameters for the domain on the xm command line. -#============================================================================ - -#---------------------------------------------------------------------------- -# Kernel image file. -kernel = "@PREFIX@/lib/xen/boot/hvmloader" - -builder='hvm' - -# Initial memory allocation (in megabytes) for the new domain. -memory = 256 - -# A name for your domain. All domains must have different names. -name = "hvm" - -#Network interface. By default emules a realtek 8139. For a NetBSD guest you -# have to disable re(4) and let rtk attach to use it. -# ne2k_pci emulates a pci ne2000 clone; this his cpu-hungry in dom0 -# pcnet emulates a AMD PCnet-PCI controller; but it corrupts packets with -# pcn(4) under NetBSD. -#vif = [ 'mac=00:16:3e:00:00:13, bridge=bridge0, type=ioemu, model=ne2k_pci' ] -#vif = [ 'mac=00:16:3e:00:00:13, bridge=bridge0, type=ioemu, model=pcnet' ] -vif = [ 'mac=00:16:3e:00:00:13, bridge=bridge0, type=ioemu' ] - -#---------------------------------------------------------------------------- -# device model to use: only qemu-dm available for now -device_model = '/usr/pkg/libexec/qemu-dm' - -# Define the disk devices you want the domain to have access to, and -# what you want them accessible as. -# Each disk entry is of the form phy:UNAME,DEV,MODE -# where UNAME is the device, DEV is the device name the domain will see, -# and MODE is r for read-only, w for read-write. -# For hvm domains you can only use hda to hdd. You can set extra types -# (e.g. cdrom) - -disk = [ 'file:/home/domains/vmx,ioemu:hda,w', 'file:/home/domains/i386cd.iso,ioemu:hdc:cdrom,r' ] - -# floppy images; this doesn't seem to work currently. Use a iso image instead. -#fda = '/home/domains/boot1.fs' - -# boot device: a = floppy, c= hard drive, d= cdrom (with the disk entry -# before) -boot='d' - -# By default, 'xm create' will try to open an X window on the current display -# for the virtual framebuffer. You can have the virtual framebuffer in vnc -# instead, and connect using a vnc client (using localhost:$vncdisplay) -# If vncunused is set to 1 (this is the default value), vncdisplay -# will be set to the first unused port; so it's recommended to -#vnc = 1 -#vncdisplay = 0 -#vncunused = 0 - -#Xen emulates a PS/2 mouse, but the pointer in the guest has difficulties -# tracking the absolute position. Xen can emulate a USB tablet in addition -# to the mouse which will report the absolute position of the pointer, -# and make the mouse much easier to use. -# -usb=1 -usbdevice='tablet' -#usbdevice='mouse' - -#============================================================================ diff --git a/sysutils/xentools30-hvm/files/qemu-ifup-nbsd b/sysutils/xentools30-hvm/files/qemu-ifup-nbsd deleted file mode 100755 index eee78765d67..00000000000 --- a/sysutils/xentools30-hvm/files/qemu-ifup-nbsd +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -ifconfig $1 up -exec /sbin/brconfig $2 add $1 diff --git a/sysutils/xentools30-hvm/files/xenio.h b/sysutils/xentools30-hvm/files/xenio.h deleted file mode 100644 index d670b414759..00000000000 --- a/sysutils/xentools30-hvm/files/xenio.h +++ /dev/null @@ -1,105 +0,0 @@ -/* NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $ */ - -/****************************************************************************** - * privcmd.h - * - * Copyright (c) 2003-2004, K A Fraser - * - * This file may be distributed separately from the Linux kernel, or - * incorporated into other software packages, subject to the following license: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this source file (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#ifndef __NetBSD_PRIVCMD_H__ -#define __NetBSD_PRIVCMD_H__ - -/* Interface to /proc/xen/privcmd */ - -typedef struct privcmd_hypercall -{ - unsigned long op; - unsigned long arg[5]; -} privcmd_hypercall_t; - -typedef struct privcmd_mmap_entry { - unsigned long va; - unsigned long mfn; - unsigned long npages; -} privcmd_mmap_entry_t; - -typedef struct privcmd_mmap { - int num; - domid_t dom; /* target domain */ - privcmd_mmap_entry_t *entry; -} privcmd_mmap_t; - -typedef struct privcmd_mmapbatch { - int num; /* number of pages to populate */ - domid_t dom; /* target domain */ - unsigned long addr; /* virtual address */ - unsigned long *arr; /* array of mfns - top nibble set on err */ -} privcmd_mmapbatch_t; - -typedef struct privcmd_blkmsg -{ - unsigned long op; - void *buf; - int buf_size; -} privcmd_blkmsg_t; - -/* - * @cmd: IOCTL_PRIVCMD_HYPERCALL - * @arg: &privcmd_hypercall_t - * Return: Value returned from execution of the specified hypercall. - */ -#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 \ - _IOR('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) -/* EVTCHN_BIND: Bind to the specified event-channel port. */ -#define EVTCHN_BIND _IOW('E', 2, unsigned long) -/* EVTCHN_UNBIND: Unbind from the specified event-channel port. */ -#define EVTCHN_UNBIND _IOW('E', 3, unsigned long) - -#endif /* __NetBSD_PRIVCMD_H__ */ diff --git a/sysutils/xentools30-hvm/files/xenio3.h b/sysutils/xentools30-hvm/files/xenio3.h deleted file mode 100644 index d3828be8c0e..00000000000 --- a/sysutils/xentools30-hvm/files/xenio3.h +++ /dev/null @@ -1,89 +0,0 @@ -/* $NetBSD: xenio3.h,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ */ -/****************************************************************************** - * evtchn.h - * - * Interface to /dev/xen/evtchn. - * - * Copyright (c) 2003-2005, K A Fraser - * - * This file may be distributed separately from the Linux kernel, or - * incorporated into other software packages, subject to the following license: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this source file (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#ifndef __NetBSD_XENIO3_H__ -#define __NetBSD_XENIO3_H__ - -/* - * Bind a fresh port to VIRQ @virq. - * Return allocated port. - */ -#define IOCTL_EVTCHN_BIND_VIRQ \ - _IOWR('E', 4, struct ioctl_evtchn_bind_virq) -struct ioctl_evtchn_bind_virq { - unsigned int virq; - unsigned int port; -}; - -/* - * Bind a fresh port to remote <@remote_domain, @remote_port>. - * Return allocated port. - */ -#define IOCTL_EVTCHN_BIND_INTERDOMAIN \ - _IOWR('E', 5, struct ioctl_evtchn_bind_interdomain) -struct ioctl_evtchn_bind_interdomain { - unsigned int remote_domain, remote_port; - unsigned int port; -}; - -/* - * Allocate a fresh port for binding to @remote_domain. - * Return allocated port. - */ -#define IOCTL_EVTCHN_BIND_UNBOUND_PORT \ - _IOWR('E', 6, struct ioctl_evtchn_bind_unbound_port) -struct ioctl_evtchn_bind_unbound_port { - unsigned int remote_domain; - unsigned int port; -}; - -/* - * Unbind previously allocated @port. - */ -#define IOCTL_EVTCHN_UNBIND \ - _IOW('E', 7, struct ioctl_evtchn_unbind) -struct ioctl_evtchn_unbind { - unsigned int port; -}; - -/* - * Send event to previously allocated @port. - */ -#define IOCTL_EVTCHN_NOTIFY \ - _IOW('E', 8, struct ioctl_evtchn_notify) -struct ioctl_evtchn_notify { - unsigned int port; -}; - -/* Clear and reinitialise the event buffer. Clear error condition. */ -#define IOCTL_EVTCHN_RESET \ - _IO('E', 9) - -#endif /* __NetBSD_XENIO3_H__ */ diff --git a/sysutils/xentools30-hvm/patches/patch-aa b/sysutils/xentools30-hvm/patches/patch-aa deleted file mode 100644 index 1e5561f5bd4..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-aa +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2007/04/28 17:14:54 bouyer Exp $ - ---- Makefile.orig 2007-01-08 16:00:46.000000000 +0100 -+++ Makefile 2007-04-26 21:56:16.000000000 +0200 -@@ -2,34 +2,11 @@ - include $(XEN_ROOT)/tools/Rules.mk - - SUBDIRS-y := --SUBDIRS-y += libxc --SUBDIRS-y += xenstore --SUBDIRS-y += misc --SUBDIRS-y += examples --SUBDIRS-y += xentrace --SUBDIRS-$(CONFIG_XCUTILS) += xcutils --SUBDIRS-$(CONFIG_X86) += firmware --SUBDIRS-y += security --SUBDIRS-y += console --SUBDIRS-y += xenmon --SUBDIRS-y += guest-headers --SUBDIRS-$(VTPM_TOOLS) += vtpm_manager --SUBDIRS-$(VTPM_TOOLS) += vtpm --SUBDIRS-y += xenstat --SUBDIRS-y += libaio --SUBDIRS-y += blktap --SUBDIRS-y += libfsimage --SUBDIRS-$(XENFB_TOOLS) += xenfb --SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen -- --# These don't cross-compile --ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) --SUBDIRS-y += python --SUBDIRS-y += pygrub --endif -+SUBDIRS-y += firmware - - .PHONY: all - all: check -+ (cd libxc ; $(MAKE) mk-symlinks) - @set -e; for subdir in $(SUBDIRS-y); do \ - $(MAKE) -C $$subdir $@; \ - done -@@ -56,18 +33,16 @@ - - .PHONY: check - check: -- $(MAKE) -C check - - .PHONY: check_clean - check_clean: -- $(MAKE) -C check clean - - .PHONY: ioemu ioemuinstall ioemuclean - ifeq ($(CONFIG_IOEMU),y) - export IOEMU_DIR ?= ioemu - ioemu ioemuinstall: - [ -f $(IOEMU_DIR)/config-host.mak ] || \ -- (cd $(IOEMU_DIR) && sh configure --prefix=/usr) -+ (cd $(IOEMU_DIR) && sh configure --prefix=$(PREFIX)) - $(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@) - ioemuclean: - $(MAKE) -C $(IOEMU_DIR) distclean diff --git a/sysutils/xentools30-hvm/patches/patch-an b/sysutils/xentools30-hvm/patches/patch-an deleted file mode 100644 index 38458e3fdf3..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-an +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-an,v 1.2 2007/04/28 17:14:54 bouyer Exp $ - ---- firmware/Makefile.orig 2007-01-08 16:00:48.000000000 +0100 -+++ firmware/Makefile 2007-04-26 21:34:58.000000000 +0200 -@@ -4,7 +4,7 @@ - # hvmloader is a 32-bit protected mode binary. - # It belongs in /usr/lib, not /usr/lib64. - TARGET := hvmloader/hvmloader --INST_DIR := $(DESTDIR)/usr/lib/xen/boot -+INST_DIR := $(PREFIX)/lib/xen/boot - - SUBDIRS := - SUBDIRS += rombios -@@ -28,8 +28,8 @@ - - .PHONY: install - install: all -- [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR) -- [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR) -+ $(BSD_INSTALL_DATA_DIR) $(INST_DIR) -+ $(BSD_INSTALL_DATA) $(TARGET) $(INST_DIR) - - .PHONY: clean - clean: diff --git a/sysutils/xentools30-hvm/patches/patch-ao b/sysutils/xentools30-hvm/patches/patch-ao deleted file mode 100644 index 9dee07ee261..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-ao +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- ioemu/configure.orig 2006-10-04 04:28:06.000000000 +0200 -+++ ioemu/configure 2006-10-18 17:37:42.000000000 +0200 -@@ -517,7 +517,7 @@ - datadir="$prefix/share/xen/qemu" - docdir="$prefix/share/doc/qemu" --bindir="$prefix/$libdir/xen/bin" -+bindir="$prefix/libexec" --configdir="/etc/xen" -+configdir="@XENDCONFDIR@" - fi - - echo "Install prefix $prefix" -@@ -653,6 +653,8 @@ - echo "#define CONFIG_WIN32 1" >> $config_h - elif test -f "/usr/include/byteswap.h" ; then - echo "#define HAVE_BYTESWAP_H 1" >> $config_h -+elif test -f "/usr/include/machine/bswap.h" ; then -+ echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h - fi - if test "$darwin" = "yes" ; then - echo "CONFIG_DARWIN=yes" >> $config_mak diff --git a/sysutils/xentools30-hvm/patches/patch-ap b/sysutils/xentools30-hvm/patches/patch-ap deleted file mode 100644 index 6c93153b05a..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- firmware/hvmloader/mkhex.orig 2006-04-13 19:48:38.000000000 +0200 -+++ firmware/hvmloader/mkhex -@@ -21,6 +21,6 @@ - # - - echo "unsigned $1[] = {" --od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/' -+od -v -t x $2 | sed 's/^[0-9]* */0x0/' | sed 's/ */, 0x/g' | sed 's/$/,/' - echo "};" - diff --git a/sysutils/xentools30-hvm/patches/patch-ar b/sysutils/xentools30-hvm/patches/patch-ar deleted file mode 100644 index 069fc5e8e98..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-ar +++ /dev/null @@ -1,142 +0,0 @@ -$NetBSD: patch-ar,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- ioemu/vl.c.orig 2006-10-15 14:22:03.000000000 +0200 -+++ ioemu/vl.c 2006-10-20 00:33:18.000000000 +0200 -@@ -37,14 +37,17 @@ - #include <sys/poll.h> - #include <sys/mman.h> - #include <sys/ioctl.h> -+#include <sys/resource.h> - #include <sys/socket.h> - #include <netinet/in.h> -+#include <net/if.h> -+#include <net/if_tap.h> - #include <arpa/inet.h> - #include <dirent.h> - #include <netdb.h> - #ifdef _BSD - #include <sys/stat.h> --#ifndef __APPLE__ -+#ifndef _BSD - #include <libutil.h> - #endif - #else -@@ -88,8 +91,8 @@ - - #include "exec-all.h" - --#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup" --#define DEFAULT_BRIDGE "xenbr0" -+#define DEFAULT_NETWORK_SCRIPT "@XENDCONFDIR@/scripts/qemu-ifup" -+#define DEFAULT_BRIDGE "bridge0" - - //#define DEBUG_UNUSED_IOPORT - //#define DEBUG_IOPORT -@@ -1603,7 +1606,7 @@ - return 0; - } - --#if defined(__linux__) -+#if defined(__linux__) || defined(__NetBSD__) - CharDriverState *qemu_chr_open_pty(void) - { - struct termios tty; -@@ -1755,7 +1758,7 @@ - chr->chr_ioctl = tty_serial_ioctl; - return chr; - } -- -+#if defined(__linux__) - static int pp_ioctl(CharDriverState *chr, int cmd, void *arg) - { - int fd = (int)chr->opaque; -@@ -1818,13 +1821,14 @@ - chr->chr_ioctl = pp_ioctl; - return chr; - } -+#endif /* __linux__ */ - - #else - CharDriverState *qemu_chr_open_pty(void) - { - return NULL; - } --#endif -+#endif /* __linux__ || __NetBSD__ */ - - #endif /* !defined(_WIN32) */ - -@@ -3064,7 +3068,7 @@ - fclose(f); - atexit(smb_exit); - -- snprintf(smb_cmdline, sizeof(smb_cmdline), "/usr/sbin/smbd -s %s", -+ snprintf(smb_cmdline, sizeof(smb_cmdline), "@PREFIX@/sbin/smbd -s %s", - smb_conf); - - slirp_add_exec(0, smb_cmdline, 4, 139); -@@ -3128,16 +3132,26 @@ - int fd; - char *dev; - struct stat s; -+ struct ifreq ifr; - - fd = open("/dev/tap", O_RDWR); - if (fd < 0) { -- fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n"); -+ fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation: %s\n", strerror(errno)); - return -1; - } - -+#ifdef TAPGIFNAME -+ if (ioctl (fd, TAPGIFNAME, (void*)&ifr) < 0) { -+ fprintf(stderr, "warning: could not open get tap name: %s\n", -+ strerror(errno)); -+ return -1; -+ } -+ pstrcpy(ifname, ifname_size, ifr.ifr_name); -+#else - fstat(fd, &s); - dev = devname(s.st_rdev, S_IFCHR); - pstrcpy(ifname, ifname_size, dev); -+#endif - - fcntl(fd, F_SETFL, O_NONBLOCK); - return fd; -@@ -5855,9 +5869,36 @@ - xen_pfn_t *page_array; - extern void *shared_page; - extern void *buffered_io_page; -+ struct rlimit rl; - - char qemu_dm_logfilename[64]; - -+ /* XXX required for now */ -+ if (setenv("PTHREAD_DIAGASSERT", "A", 1) != 0) -+ perror("setenv"); -+ if (getrlimit(RLIMIT_STACK, &rl) != 0) { -+ perror("getrlimit(RLIMIT_STACK)"); -+ exit(1); -+ } -+ rl.rlim_cur = rl.rlim_max; -+ if (setrlimit(RLIMIT_STACK, &rl) != 0) -+ perror("setrlimit(RLIMIT_STACK)"); -+ if (getrlimit(RLIMIT_DATA, &rl) != 0) { -+ perror("getrlimit(RLIMIT_DATA)"); -+ exit(1); -+ } -+ rl.rlim_cur = rl.rlim_max; -+ if (setrlimit(RLIMIT_DATA, &rl) != 0) -+ perror("setrlimit(RLIMIT_DATA)"); -+ rl.rlim_cur = RLIM_INFINITY; -+ rl.rlim_max = RLIM_INFINITY; -+ if (setrlimit(RLIMIT_RSS, &rl) != 0) -+ perror("setrlimit(RLIMIT_RSS)"); -+ rl.rlim_cur = RLIM_INFINITY; -+ rl.rlim_max = RLIM_INFINITY; -+ if (setrlimit(RLIMIT_MEMLOCK, &rl) != 0) -+ perror("setrlimit(RLIMIT_MEMLOCK)"); -+ - LIST_INIT (&vm_change_state_head); - #ifndef _WIN32 - { diff --git a/sysutils/xentools30-hvm/patches/patch-as b/sysutils/xentools30-hvm/patches/patch-as deleted file mode 100644 index a01d665dc23..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-as +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-as,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- ioemu/bswap.h.orig 2006-04-13 19:48:38.000000000 +0200 -+++ ioemu/bswap.h -@@ -5,6 +5,12 @@ - - #include <inttypes.h> - -+#ifdef HAVE_MACHINE_BSWAP_H -+#include <sys/endian.h> -+#include <sys/types.h> -+#include <machine/bswap.h> -+#else -+ - #ifdef HAVE_BYTESWAP_H - #include <byteswap.h> - #else -@@ -58,6 +64,8 @@ static inline uint64_t bswap64(uint64_t - return bswap_64(x); - } - -+#endif /* ! HAVE_MACHINE_BSWAP_H */ -+ - static inline void bswap16s(uint16_t *s) - { - *s = bswap16(*s); diff --git a/sysutils/xentools30-hvm/patches/patch-at b/sysutils/xentools30-hvm/patches/patch-at deleted file mode 100644 index c9de9e20fbb..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- ioemu/audio/ossaudio.c.orig 2006-10-04 04:28:03.000000000 +0200 -+++ ioemu/audio/ossaudio.c 2006-10-18 17:43:53.000000000 +0200 -@@ -231,7 +231,7 @@ - goto err; - } - -- if (ioctl (fd, SNDCTL_DSP_NONBLOCK)) { -+ if (ioctl (fd, SNDCTL_DSP_NONBLOCK, NULL)) { - oss_logerr2 (errno, typ, "Failed to set non-blocking mode\n"); - goto err; - } diff --git a/sysutils/xentools30-hvm/patches/patch-au b/sysutils/xentools30-hvm/patches/patch-au deleted file mode 100644 index 235349eb16c..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-au +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-au,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- libxc/xc_private.h.orig 2006-10-16 22:15:35.000000000 +0200 -+++ libxc/xc_private.h 2006-10-16 22:16:09.000000000 +0200 -@@ -15,7 +15,11 @@ - - #include "xenctrl.h" - -+#ifdef __NetBSD__ -+#include <xen/NetBSD/xenio.h> -+#else - #include <xen/sys/privcmd.h> -+#endif - - /* valgrind cannot see when a hypercall has filled in some values. For this - reason, we must zero the privcmd_hypercall_t or domctl/sysctl instance diff --git a/sysutils/xentools30-hvm/patches/patch-av b/sysutils/xentools30-hvm/patches/patch-av deleted file mode 100644 index e71fe17c80c..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-av +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-av,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- libxc/xg_private.h.orig 2006-10-16 22:15:35.000000000 +0200 -+++ libxc/xg_private.h 2006-10-16 22:16:19.000000000 +0200 -@@ -15,7 +15,6 @@ - #include "xenguest.h" - #include "xc_private.h" - --#include <xen/sys/privcmd.h> - #include <xen/memory.h> - #include <xen/elfnote.h> - diff --git a/sysutils/xentools30-hvm/patches/patch-aw b/sysutils/xentools30-hvm/patches/patch-aw deleted file mode 100644 index eafc3003761..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-aw +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- ioemu/audio/mixeng.c.orig 2006-10-04 04:28:03.000000000 +0200 -+++ ioemu/audio/mixeng.c 2006-10-18 17:45:57.000000000 +0200 -@@ -102,6 +102,7 @@ - #undef SHIFT - - t_sample *mixeng_conv[2][2][2][2] = { -+#if !defined(__NetBSD__) - { - { - { -@@ -146,9 +147,11 @@ - } - } - } -+#endif /* !__NetBSD__ */ - }; - - f_sample *mixeng_clip[2][2][2][2] = { -+#if !defined(__NetBSD__) - { - { - { -@@ -193,6 +196,7 @@ - } - } - } -+#endif /* !__NetBSD__ */ - }; - - /* diff --git a/sysutils/xentools30-hvm/patches/patch-ax b/sysutils/xentools30-hvm/patches/patch-ax deleted file mode 100644 index 28d05e7af88..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-ax +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- ioemu/vnc.c.orig 2006-10-19 22:23:35.000000000 +0200 -+++ ioemu/vnc.c 2006-10-19 22:26:50.000000000 +0200 -@@ -24,6 +24,9 @@ - * THE SOFTWARE. - */ - -+#include <sys/stat.h> -+#include <sys/socket.h> -+#include <netinet/in.h> - #include "vl.h" - #include "qemu_socket.h" - #include <assert.h> diff --git a/sysutils/xentools30-hvm/patches/patch-ay b/sysutils/xentools30-hvm/patches/patch-ay deleted file mode 100644 index fa22fadf2a0..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-ay +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ay,v 1.2 2007/04/28 17:14:54 bouyer Exp $ - ---- ioemu/Makefile.orig 2007-04-26 21:45:35.000000000 +0200 -+++ ioemu/Makefile 2007-04-26 21:49:09.000000000 +0200 -@@ -72,7 +72,7 @@ - endif - - install: all $(if $(BUILD_DOCS),install-doc) -- mkdir -p "$(DESTDIR)$(bindir)" -+ $(BSD_INSTALL_PROGRAM_DIR) "$(bindir)" - # $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" - # mkdir -p "$(DESTDIR)$(datadir)" - # for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ -@@ -80,9 +80,9 @@ - # $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ - # done - ifndef CONFIG_WIN32 -- mkdir -p "$(DESTDIR)$(datadir)/keymaps" -+ $(BSD_INSTALL_DATA_DIR) "$(datadir)/keymaps" - for x in $(KEYMAPS); do \ -- $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ -+ $(BSD_INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(datadir)/keymaps"; \ - done - endif - for d in $(TARGET_DIRS); do \ diff --git a/sysutils/xentools30-hvm/patches/patch-ba b/sysutils/xentools30-hvm/patches/patch-ba deleted file mode 100644 index d6dfced3aee..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-ba +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $ - ---- ioemu/target-i386-dm/exec-dm.c.orig 2006-10-18 18:19:27.000000000 +0200 -+++ ioemu/target-i386-dm/exec-dm.c 2006-10-18 18:19:40.000000000 +0200 -@@ -163,8 +163,8 @@ - #else - setvbuf(logfile, NULL, _IOLBF, 0); - #endif -- stdout = logfile; -- stderr = logfile; -+ dup2(fileno(logfile), 1); -+ dup2(fileno(logfile), 2); - } - } - diff --git a/sysutils/xentools30-hvm/patches/patch-bb b/sysutils/xentools30-hvm/patches/patch-bb deleted file mode 100644 index bd18e7cda85..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-bb +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bb,v 1.2 2007/04/28 17:14:54 bouyer Exp $ - ---- ioemu/Makefile.target.orig 2007-01-08 16:00:48.000000000 +0100 -+++ ioemu/Makefile.target 2007-04-26 21:38:21.000000000 +0200 -@@ -567,12 +567,8 @@ - rm -rf config.mak config.h - - install: all -- mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" --ifneq ($(PROGS),) -- $(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)" --endif -- $(INSTALL_PROG) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)" -- $(INSTALL_PROG) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)" -+ $(BSD_INSTALL_PROGRAM_DIR) "$(bindir)" -+ $(BSD_INSTALL_PROGRAM) $(PROGS) "$(DESTDIR)$(bindir)" - - ifneq ($(wildcard .depend),) - include .depend diff --git a/sysutils/xentools30-hvm/patches/patch-bv b/sysutils/xentools30-hvm/patches/patch-bv deleted file mode 100644 index be24a9aee9f..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-bv +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bv,v 1.2 2007/04/28 17:14:54 bouyer Exp $ - ---- libxc/xenctrl.h.orig 2007-01-08 16:00:49.000000000 +0100 -+++ libxc/xenctrl.h 2007-04-26 21:40:23.000000000 +0200 -@@ -16,6 +16,9 @@ - - #include <stddef.h> - #include <stdint.h> -+#undef uint8_t -+#undef uint16_t -+#undef uint32_t - #include <xen/xen.h> - #include <xen/domctl.h> - #include <xen/sysctl.h> diff --git a/sysutils/xentools30-hvm/patches/patch-ci b/sysutils/xentools30-hvm/patches/patch-ci deleted file mode 100644 index b6480b98abb..00000000000 --- a/sysutils/xentools30-hvm/patches/patch-ci +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2007/04/28 17:14:54 bouyer Exp $ - ---- ../xen/include/public/arch-x86/xen.h.orig 2007-04-25 19:25:41.000000000 +0200 -+++ ../xen/include/public/arch-x86/xen.h 2007-04-25 19:25:43.000000000 +0200 -@@ -35,9 +35,10 @@ - #define __DEFINE_XEN_GUEST_HANDLE(name, type) \ - typedef type * __guest_handle_ ## name - #endif -+#define __XEN_GUEST_HANDLE(name) __guest_handle_ ## name - - #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) --#define XEN_GUEST_HANDLE(name) __guest_handle_ ## name -+#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name) - #define set_xen_guest_handle(hnd, val) do { (hnd).p = val; } while (0) - #ifdef __XEN_TOOLS__ - #define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0) diff --git a/sysutils/xentools30/DESCR b/sysutils/xentools30/DESCR deleted file mode 100644 index a687436b5b0..00000000000 --- a/sysutils/xentools30/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -The Xen virtual machine monitor allows running several virtual machines -on a single physical machine. The xentools30 package contains the -tools to create, destroy and control the virtual machines. - -The xentools30 package contains the tools for Xen 3.0 diff --git a/sysutils/xentools30/MESSAGE.NetBSD b/sysutils/xentools30/MESSAGE.NetBSD deleted file mode 100644 index 590781941e8..00000000000 --- a/sysutils/xentools30/MESSAGE.NetBSD +++ /dev/null @@ -1,17 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.NetBSD,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - -Please ensure that the Xen-specific devices needed by xend(8) exist: - - cd /dev && sh MAKEDEV xen - -There are example configuration files for setting up a guest domain in: - - ${EGDIR}/ - -Please also refer to the the "NetBSD/xen How-To" for more information on -creating a Xen setup: - - http://www.NetBSD.org/Ports/xen/howto.html - -=========================================================================== diff --git a/sysutils/xentools30/Makefile b/sysutils/xentools30/Makefile deleted file mode 100644 index 0fa018a7415..00000000000 --- a/sysutils/xentools30/Makefile +++ /dev/null @@ -1,185 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2007/04/28 17:41:31 bouyer Exp $ -# - -DISTNAME= xen-3.0.4_1-src -PKGNAME= xentools30-3.0.4 -CATEGORIES= sysutils -MASTER_SITES= http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \ - http://bits.xensource.com/oss-xen/release/3.0.4-1/src.tgz/ -EXTRACT_SUFX= .tgz - -MAINTAINER= bouyer@NetBSD.org -HOMEPAGE= http://www.cl.cam.ac.uk/research/srg/netos/xen/ -COMMENT= Userland Tools for Xen - -#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted - -PKG_SYSCONFSUBDIR= xen - -ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 - -CONFLICTS+= libxen-[0-9]* -CONFLICTS+= xentools20-[0-9]* - -WRKSRC= ${WRKDIR}/xen-3.0.4_1-src/tools -CHECK_PORTABILITY_SKIP= examples/* - -EGDIR= ${PREFIX}/share/examples/xen -MESSAGE_SUBST= EGDIR=${EGDIR} - -USE_TOOLS+= perl #for pod2man -USE_TOOLS+= gmake -MAKE_ENV+= CONFIG_NetBSD=yes -MAKE_ENV+= CONFIG_MBOOTPACK=no -MAKE_ENV+= EGDIR=${EGDIR:Q} -MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} -MAKE_ENV+= XEN_TARGET_ARCH="x86_32" -PYTHON_VERSIONS_ACCEPTED= 24 23 -PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS+= misc/xm -PYTHON_PATCH_SCRIPTS+= misc/netfix -PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool -PYTHON_PATCH_SCRIPTS+= misc/xencons -PYTHON_PATCH_SCRIPTS+= misc/xend -PYTHON_PATCH_SCRIPTS+= misc/xensymoops -PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub -PYTHON_PATCH_SCRIPTS+= python/xen/util/bugtool.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/sxp.py -PYTHON_PATCH_SCRIPTS+= python/xen/util/pci.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/FlatDeviceTree.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/XendClient.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/arch.py -PYTHON_PATCH_SCRIPTS+= python/test.py -PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi -PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/main.py -PYTHON_PATCH_SCRIPTS+= security/python/setup.py -PYTHON_PATCH_SCRIPTS+= security/xensec_gen.py -PYTHON_PATCH_SCRIPTS+= xenmon/xenmon.py -PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format - -SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= ioemu/vl.c -SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g" -SUBST_MESSAGE.paths= Fixing hardcoded paths. - -SUBST_CLASSES+= pathsvar -SUBST_STAGE.pathsvar= pre-configure -SUBST_FILES.pathsvar= examples/init.d/sysconfig.xendomains \ - examples/xend-config.sxp \ - python/xen/xend/server/relocate.py \ - python/xen/xend/XendRoot.py \ - security/Makefile security/python/xensec_gen/main.py \ - xenstore/xs_lib.c -SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" - -SUBST_CLASSES+= py -SUBST_STAGE.py= pre-configure -SUBST_FILES.py= pygrub/Makefile -SUBST_FILES.py+= python/Makefile -SUBST_FILES.py+= security/Makefile -SUBST_SED.py= -e "s,python,${PYTHONBIN},g" - -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_FILES.conf= python/xen/xend/XendRoot.py -SUBST_FILES.conf+= python/xen/xend/osdep.py -SUBST_FILES.conf+= python/xen/xm/create.py -SUBST_FILES.conf+= python/xen/xm/addlabel.py -SUBST_FILES.conf+= python/xen/xm/getlabel.py -SUBST_FILES.conf+= python/xen/xm/rmlabel.py -SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" - -SUBST_CLASSES+= prefix -SUBST_STAGE.prefix= pre-configure -SUBST_FILES.prefix= python/xen/util/auxbin.py -SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},g" - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -SUBST_CLASSES+= proc -SUBST_STAGE.proc= pre-configure -SUBST_FILES.proc= python/xen/xend/XendVnet.py -SUBST_FILES.proc+= python/xen/xend/balloon.py -SUBST_FILES.proc+= xenstore/xs_lib.c -SUBST_SED.proc= -e "s|/proc|/kern|g" -PROCPATH= /kern -.else -PROCPATH= /proc -.endif - -RCD_SCRIPTS= xend xenbackendd xendomains -FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q} -FILES_SUBST+= PROCPATH=${PROCPATH:Q} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} - -XEND_SCRIPTS= block vif-bridge vif-ip - -CONF_FILES= ${EGDIR}/xend-config.sxp \ - ${PKG_SYSCONFDIR}/xend-config.sxp -.for s in ${XEND_SCRIPTS} -CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ - ${ROOT_USER} ${ROOT_GROUP} 0755 -.endfor - -OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen - -pre-build: - ${MKDIR} ${WRKSRC}/libxc/xen/NetBSD - ${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio.h || \ - ${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen/NetBSD - ${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio3.h || \ - ${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen/NetBSD - ${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/ - pod2man ${WRKSRC}/../docs/man/xend-config.sxp.pod.5 |\ - sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ - >${WRKDIR}/xend-config.sxp.5 - pod2man ${WRKSRC}/../docs/man/xmdomain.cfg.pod.5 |\ - sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ - >${WRKDIR}/xmdomain.cfg.5 - pod2man ${WRKSRC}/../docs/man/xm.pod.1 |\ - sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ - >${WRKDIR}/xm.1 - -.if ${OPSYS} == "NetBSD" -post-build: - cd ${FILESDIR}; for src in *-nbsd; do \ - dst="$${src%-nbsd}"; \ - ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ - -e "s|@PREFIX@|${PREFIX}|g" \ - $$src > ${WRKSRC}/examples/$$dst; \ - done - ${CC} ${CFLAGS} ${LDFLAGS} \ - -DVBD_SCRIPT=\"${PKG_SYSCONFDIR}/scripts/block\" \ - -DLOG_FILE=\"${VARBASE}/log/xenbackendd.log\" \ - -DPID_FILE=\"${VARBASE}/run/xenbackendd.pid\" \ - -o ${WRKDIR}/xenbackendd.bin ${FILESDIR}/xenbackendd.c \ - -I${WRKSRC}/libxc -L${WRKSRC}/libxc \ - -I${WRKSRC}/xenstore -L${WRKSRC}/xenstore \ - -lxenctrl -lxenstore - -.endif - -post-install: - ${INSTALL_PROGRAM} ${WRKDIR}/xenbackendd.bin ${PREFIX}/sbin/xenbackendd - ${INSTALL_DATA_DIR} ${EGDIR} - for f in xend-config.sxp xmexample1 xmexample2 xmexample3 netbsd1; do \ - ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${EGDIR}/$$f; \ - done -.for s in ${XEND_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${EGDIR}/${s} -.endfor - ${RM} -rf ${PREFIX}/lib/xen - ${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${PREFIX}/man/man5 - ${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${PREFIX}/man/man5 - ${INSTALL_DATA} ${WRKDIR}/xm.1 ${PREFIX}/man/man1 - -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.include "../../textproc/py-xml/buildlink3.mk" -#.include "../../devel/zlib/buildlink3.mk" -#.include "../../www/curl/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xentools30/PLIST b/sysutils/xentools30/PLIST deleted file mode 100644 index 4aa5cfa7855..00000000000 --- a/sysutils/xentools30/PLIST +++ /dev/null @@ -1,329 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2007/04/28 17:14:50 bouyer Exp $ -bin/readnotes -bin/xc_restore -bin/xc_save -bin/xc_shadow -bin/xencons -bin/xenconsole -bin/xenperf -bin/xenstore-chmod -bin/xenstore-control -bin/xenstore-exists -bin/xenstore-list -bin/xenstore-ls -bin/xenstore-read -bin/xenstore-rm -bin/xenstore-write -include/xenctrl.h -include/xenguest.h -include/xs.h -include/xs_lib.h -lib/libxenctrl.a -lib/libxenctrl.so -lib/libxenctrl.so.3.0 -lib/libxenctrl.so.3.0.0 -lib/libxenguest.a -lib/libxenguest.so -lib/libxenguest.so.3.0 -lib/libxenguest.so.3.0.0 -lib/libxenstore.a -lib/libxenstore.so -lib/libxenstore.so.3.0 -lib/libxenstore.so.3.0.0 -man/man1/xentop.1 -man/man1/xm.1 -man/man5/xend-config.sxp.5 -man/man5/xmdomain.cfg.5 -${PYSITELIB}/xen/__init__.py -${PYSITELIB}/xen/__init__.pyc -${PYSITELIB}/xen/lowlevel/__init__.py -${PYSITELIB}/xen/lowlevel/__init__.pyc -${PYSITELIB}/xen/lowlevel/acm.so -${PYSITELIB}/xen/lowlevel/xc.so -${PYSITELIB}/xen/lowlevel/xs.so -${PYSITELIB}/xen/sv/CreateDomain.py -${PYSITELIB}/xen/sv/CreateDomain.pyc -${PYSITELIB}/xen/sv/DomInfo.py -${PYSITELIB}/xen/sv/DomInfo.pyc -${PYSITELIB}/xen/sv/GenTabbed.py -${PYSITELIB}/xen/sv/GenTabbed.pyc -${PYSITELIB}/xen/sv/HTMLBase.py -${PYSITELIB}/xen/sv/HTMLBase.pyc -${PYSITELIB}/xen/sv/Main.py -${PYSITELIB}/xen/sv/Main.pyc -${PYSITELIB}/xen/sv/NodeInfo.py -${PYSITELIB}/xen/sv/NodeInfo.pyc -${PYSITELIB}/xen/sv/RestoreDomain.py -${PYSITELIB}/xen/sv/RestoreDomain.pyc -${PYSITELIB}/xen/sv/Wizard.py -${PYSITELIB}/xen/sv/Wizard.pyc -${PYSITELIB}/xen/sv/__init__.py -${PYSITELIB}/xen/sv/__init__.pyc -${PYSITELIB}/xen/sv/util.py -${PYSITELIB}/xen/sv/util.pyc -${PYSITELIB}/xen/util/Brctl.py -${PYSITELIB}/xen/util/Brctl.pyc -${PYSITELIB}/xen/util/SSHTransport.py -${PYSITELIB}/xen/util/SSHTransport.pyc -${PYSITELIB}/xen/util/__init__.py -${PYSITELIB}/xen/util/__init__.pyc -${PYSITELIB}/xen/util/asserts.py -${PYSITELIB}/xen/util/asserts.pyc -${PYSITELIB}/xen/util/auxbin.py -${PYSITELIB}/xen/util/auxbin.pyc -${PYSITELIB}/xen/util/blkif.py -${PYSITELIB}/xen/util/blkif.pyc -${PYSITELIB}/xen/util/bugtool.py -${PYSITELIB}/xen/util/bugtool.pyc -${PYSITELIB}/xen/util/diagnose.py -${PYSITELIB}/xen/util/diagnose.pyc -${PYSITELIB}/xen/util/dictio.py -${PYSITELIB}/xen/util/dictio.pyc -${PYSITELIB}/xen/util/ip.py -${PYSITELIB}/xen/util/ip.pyc -${PYSITELIB}/xen/util/mac.py -${PYSITELIB}/xen/util/mac.pyc -${PYSITELIB}/xen/util/mkdir.py -${PYSITELIB}/xen/util/mkdir.pyc -${PYSITELIB}/xen/util/pci.py -${PYSITELIB}/xen/util/pci.pyc -${PYSITELIB}/xen/util/security.py -${PYSITELIB}/xen/util/security.pyc -${PYSITELIB}/xen/util/xmlrpclib2.py -${PYSITELIB}/xen/util/xmlrpclib2.pyc -${PYSITELIB}/xen/util/xpopen.py -${PYSITELIB}/xen/util/xpopen.pyc -${PYSITELIB}/xen/web/SrvBase.py -${PYSITELIB}/xen/web/SrvBase.pyc -${PYSITELIB}/xen/web/SrvDir.py -${PYSITELIB}/xen/web/SrvDir.pyc -${PYSITELIB}/xen/web/__init__.py -${PYSITELIB}/xen/web/__init__.pyc -${PYSITELIB}/xen/web/connection.py -${PYSITELIB}/xen/web/connection.pyc -${PYSITELIB}/xen/web/http.py -${PYSITELIB}/xen/web/http.pyc -${PYSITELIB}/xen/web/httpserver.py -${PYSITELIB}/xen/web/httpserver.pyc -${PYSITELIB}/xen/web/protocol.py -${PYSITELIB}/xen/web/protocol.pyc -${PYSITELIB}/xen/web/resource.py -${PYSITELIB}/xen/web/resource.pyc -${PYSITELIB}/xen/web/static.py -${PYSITELIB}/xen/web/static.pyc -${PYSITELIB}/xen/web/tcp.py -${PYSITELIB}/xen/web/tcp.pyc -${PYSITELIB}/xen/web/unix.py -${PYSITELIB}/xen/web/unix.pyc -${PYSITELIB}/xen/xend/Args.py -${PYSITELIB}/xen/xend/Args.pyc -${PYSITELIB}/xen/xend/FlatDeviceTree.py -${PYSITELIB}/xen/xend/FlatDeviceTree.pyc -${PYSITELIB}/xen/xend/PrettyPrint.py -${PYSITELIB}/xen/xend/PrettyPrint.pyc -${PYSITELIB}/xen/xend/Vifctl.py -${PYSITELIB}/xen/xend/Vifctl.pyc -${PYSITELIB}/xen/xend/XendAPIConstants.py -${PYSITELIB}/xen/xend/XendAPIConstants.pyc -${PYSITELIB}/xen/xend/XendConfig.py -${PYSITELIB}/xen/xend/XendConfig.pyc -${PYSITELIB}/xen/xend/XendAPI.py -${PYSITELIB}/xen/xend/XendAPI.pyc -${PYSITELIB}/xen/xend/osdep.py -${PYSITELIB}/xen/xend/osdep.pyc -${PYSITELIB}/xen/xend/XendVDI.py -${PYSITELIB}/xen/xend/XendVDI.pyc -${PYSITELIB}/xen/xend/XendAuthSessions.py -${PYSITELIB}/xen/xend/XendAuthSessions.pyc -${PYSITELIB}/xen/xend/XendBootloader.py -${PYSITELIB}/xen/xend/XendBootloader.pyc -${PYSITELIB}/xen/xend/XendCheckpoint.py -${PYSITELIB}/xen/xend/XendCheckpoint.pyc -${PYSITELIB}/xen/xend/XendClient.py -${PYSITELIB}/xen/xend/XendClient.pyc -${PYSITELIB}/xen/xend/XendConstants.py -${PYSITELIB}/xen/xend/XendConstants.pyc -${PYSITELIB}/xen/xend/XendDevices.py -${PYSITELIB}/xen/xend/XendDevices.pyc -${PYSITELIB}/xen/xend/XendDmesg.py -${PYSITELIB}/xen/xend/XendDmesg.pyc -${PYSITELIB}/xen/xend/XendDomain.py -${PYSITELIB}/xen/xend/XendDomain.pyc -${PYSITELIB}/xen/xend/XendDomainInfo.py -${PYSITELIB}/xen/xend/XendDomainInfo.pyc -${PYSITELIB}/xen/xend/XendError.py -${PYSITELIB}/xen/xend/XendError.pyc -${PYSITELIB}/xen/xend/XendLogging.py -${PYSITELIB}/xen/xend/XendLogging.pyc -${PYSITELIB}/xen/xend/XendNode.py -${PYSITELIB}/xen/xend/XendNode.pyc -${PYSITELIB}/xen/xend/XendProtocol.py -${PYSITELIB}/xen/xend/XendProtocol.pyc -${PYSITELIB}/xen/xend/XendRoot.py -${PYSITELIB}/xen/xend/XendRoot.pyc -${PYSITELIB}/xen/xend/XendStorageRepository.py -${PYSITELIB}/xen/xend/XendStorageRepository.pyc -${PYSITELIB}/xen/xend/XendVnet.py -${PYSITELIB}/xen/xend/XendVnet.pyc -${PYSITELIB}/xen/xend/__init__.py -${PYSITELIB}/xen/xend/__init__.pyc -${PYSITELIB}/xen/xend/arch.py -${PYSITELIB}/xen/xend/arch.pyc -${PYSITELIB}/xen/xend/balloon.py -${PYSITELIB}/xen/xend/balloon.pyc -${PYSITELIB}/xen/xend/encode.py -${PYSITELIB}/xen/xend/encode.pyc -${PYSITELIB}/xen/xend/image.py -${PYSITELIB}/xen/xend/image.pyc -${PYSITELIB}/xen/xend/server/BlktapController.py -${PYSITELIB}/xen/xend/server/BlktapController.pyc -${PYSITELIB}/xen/xend/server/DevController.py -${PYSITELIB}/xen/xend/server/DevController.pyc -${PYSITELIB}/xen/xend/server/XMLRPCServer.py -${PYSITELIB}/xen/xend/server/XMLRPCServer.pyc -${PYSITELIB}/xen/xend/server/SrvDaemon.py -${PYSITELIB}/xen/xend/server/SrvDaemon.pyc -${PYSITELIB}/xen/xend/server/SrvDmesg.py -${PYSITELIB}/xen/xend/server/SrvDmesg.pyc -${PYSITELIB}/xen/xend/server/SrvDomain.py -${PYSITELIB}/xen/xend/server/SrvDomain.pyc -${PYSITELIB}/xen/xend/server/SrvDomainDir.py -${PYSITELIB}/xen/xend/server/SrvDomainDir.pyc -${PYSITELIB}/xen/xend/server/SrvNode.py -${PYSITELIB}/xen/xend/server/SrvNode.pyc -${PYSITELIB}/xen/xend/server/SrvRoot.py -${PYSITELIB}/xen/xend/server/SrvRoot.pyc -${PYSITELIB}/xen/xend/server/SrvServer.py -${PYSITELIB}/xen/xend/server/SrvServer.pyc -${PYSITELIB}/xen/xend/server/SrvVnetDir.py -${PYSITELIB}/xen/xend/server/SrvVnetDir.pyc -${PYSITELIB}/xen/xend/server/SrvXendLog.py -${PYSITELIB}/xen/xend/server/SrvXendLog.pyc -${PYSITELIB}/xen/xend/server/__init__.py -${PYSITELIB}/xen/xend/server/__init__.pyc -${PYSITELIB}/xen/xend/server/blkif.py -${PYSITELIB}/xen/xend/server/blkif.pyc -${PYSITELIB}/xen/xend/server/iopif.py -${PYSITELIB}/xen/xend/server/iopif.pyc -${PYSITELIB}/xen/xend/server/irqif.py -${PYSITELIB}/xen/xend/server/irqif.pyc -${PYSITELIB}/xen/xend/server/netif.py -${PYSITELIB}/xen/xend/server/netif.pyc -${PYSITELIB}/xen/xend/server/params.py -${PYSITELIB}/xen/xend/server/params.pyc -${PYSITELIB}/xen/xend/server/pciif.py -${PYSITELIB}/xen/xend/server/pciif.pyc -${PYSITELIB}/xen/xend/server/pciquirk.py -${PYSITELIB}/xen/xend/server/pciquirk.pyc -${PYSITELIB}/xen/xend/server/relocate.py -${PYSITELIB}/xen/xend/server/relocate.pyc -${PYSITELIB}/xen/xend/server/tests/__init__.py -${PYSITELIB}/xen/xend/server/tests/__init__.pyc -${PYSITELIB}/xen/xend/server/tests/test_controllers.py -${PYSITELIB}/xen/xend/server/tests/test_controllers.pyc -${PYSITELIB}/xen/xend/server/tpmif.py -${PYSITELIB}/xen/xend/server/tpmif.pyc -${PYSITELIB}/xen/xend/server/usbif.py -${PYSITELIB}/xen/xend/server/usbif.pyc -${PYSITELIB}/xen/xend/server/vfbif.py -${PYSITELIB}/xen/xend/server/vfbif.pyc -${PYSITELIB}/xen/xend/sxp.py -${PYSITELIB}/xen/xend/sxp.pyc -${PYSITELIB}/xen/xend/tests/__init__.py -${PYSITELIB}/xen/xend/tests/__init__.pyc -${PYSITELIB}/xen/xend/tests/test_sxp.py -${PYSITELIB}/xen/xend/tests/test_sxp.pyc -${PYSITELIB}/xen/xend/tests/test_uuid.py -${PYSITELIB}/xen/xend/tests/test_uuid.pyc -${PYSITELIB}/xen/xend/uuid.py -${PYSITELIB}/xen/xend/uuid.pyc -${PYSITELIB}/xen/xend/xenstore/__init__.py -${PYSITELIB}/xen/xend/xenstore/__init__.pyc -${PYSITELIB}/xen/xend/xenstore/tests/__init__.py -${PYSITELIB}/xen/xend/xenstore/tests/__init__.pyc -${PYSITELIB}/xen/xend/xenstore/tests/stress_xs.py -${PYSITELIB}/xen/xend/xenstore/tests/stress_xs.pyc -${PYSITELIB}/xen/xend/xenstore/xstransact.py -${PYSITELIB}/xen/xend/xenstore/xstransact.pyc -${PYSITELIB}/xen/xend/xenstore/xsutil.py -${PYSITELIB}/xen/xend/xenstore/xsutil.pyc -${PYSITELIB}/xen/xend/xenstore/xswatch.py -${PYSITELIB}/xen/xend/xenstore/xswatch.pyc -${PYSITELIB}/xen/xm/__init__.py -${PYSITELIB}/xen/xm/__init__.pyc -${PYSITELIB}/xen/xm/XenAPI.py -${PYSITELIB}/xen/xm/XenAPI.pyc -${PYSITELIB}/xen/xm/addlabel.py -${PYSITELIB}/xen/xm/addlabel.pyc -${PYSITELIB}/xen/xm/cfgbootpolicy.py -${PYSITELIB}/xen/xm/cfgbootpolicy.pyc -${PYSITELIB}/xen/xm/console.py -${PYSITELIB}/xen/xm/console.pyc -${PYSITELIB}/xen/xm/create.py -${PYSITELIB}/xen/xm/create.pyc -${PYSITELIB}/xen/xm/dry-run.py -${PYSITELIB}/xen/xm/dry-run.pyc -${PYSITELIB}/xen/xm/dumppolicy.py -${PYSITELIB}/xen/xm/dumppolicy.pyc -${PYSITELIB}/xen/xm/getlabel.py -${PYSITELIB}/xen/xm/getlabel.pyc -${PYSITELIB}/xen/xm/help.py -${PYSITELIB}/xen/xm/help.pyc -${PYSITELIB}/xen/xm/labels.py -${PYSITELIB}/xen/xm/labels.pyc -${PYSITELIB}/xen/xm/loadpolicy.py -${PYSITELIB}/xen/xm/loadpolicy.pyc -${PYSITELIB}/xen/xm/makepolicy.py -${PYSITELIB}/xen/xm/makepolicy.pyc -${PYSITELIB}/xen/xm/main.py -${PYSITELIB}/xen/xm/main.pyc -${PYSITELIB}/xen/xm/migrate.py -${PYSITELIB}/xen/xm/migrate.pyc -${PYSITELIB}/xen/xm/new.py -${PYSITELIB}/xen/xm/new.pyc -${PYSITELIB}/xen/xm/opts.py -${PYSITELIB}/xen/xm/opts.pyc -${PYSITELIB}/xen/xm/resources.py -${PYSITELIB}/xen/xm/resources.pyc -${PYSITELIB}/xen/xm/rmlabel.py -${PYSITELIB}/xen/xm/rmlabel.pyc -${PYSITELIB}/xen/xm/shutdown.py -${PYSITELIB}/xen/xm/shutdown.pyc -${PYSITELIB}/xen/xm/tests/__init__.py -${PYSITELIB}/xen/xm/tests/__init__.pyc -${PYSITELIB}/xen/xm/tests/test_create.py -${PYSITELIB}/xen/xm/tests/test_create.pyc -sbin/netfix -sbin/xen-bugtool -sbin/xenbackendd -sbin/xenconsoled -sbin/xend -sbin/xenperf -sbin/xenstored -sbin/xentop -sbin/xm -share/examples/rc.d/xend -share/examples/rc.d/xenbackendd -share/examples/rc.d/xendomains -share/examples/xen/block -share/examples/xen/vif-bridge -share/examples/xen/vif-ip -share/examples/xen/xend-config.sxp -share/examples/xen/netbsd1 -share/examples/xen/xmexample1 -share/examples/xen/xmexample2 -share/examples/xen/xmexample3 -@dirrm share/examples/xen -@dirrm ${PYSITELIB}/xen/xm/tests -@dirrm ${PYSITELIB}/xen/xm -@dirrm ${PYSITELIB}/xen/xend/xenstore/tests -@dirrm ${PYSITELIB}/xen/xend/xenstore -@dirrm ${PYSITELIB}/xen/xend/tests -@dirrm ${PYSITELIB}/xen/xend/server/tests -@dirrm ${PYSITELIB}/xen/xend/server -@dirrm ${PYSITELIB}/xen/xend -@dirrm ${PYSITELIB}/xen/web -@dirrm ${PYSITELIB}/xen/util -@dirrm ${PYSITELIB}/xen/sv -@dirrm ${PYSITELIB}/xen/lowlevel -@dirrm ${PYSITELIB}/xen diff --git a/sysutils/xentools30/buildlink3.mk b/sysutils/xentools30/buildlink3.mk deleted file mode 100644 index cf9b6a055cc..00000000000 --- a/sysutils/xentools30/buildlink3.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1 2006/10/19 22:57:13 bouyer Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XENTOOLS30_BUILDLINK3_MK:= ${XENTOOLS30_BUILDLINK3_MK}+ - -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xentools30 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxentools30} -BUILDLINK_PACKAGES+= xentools30 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xentools30 - -.if ${XENTOOLS30_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xentools30+= xentools30>=3.0.2.2 -BUILDLINK_PKGSRCDIR.xentools30?= ../../sysutils/xentools30 -.endif # XENTOOLS30_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xentools30/distinfo b/sysutils/xentools30/distinfo deleted file mode 100644 index 17081fdb3ae..00000000000 --- a/sysutils/xentools30/distinfo +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: distinfo,v 1.6 2007/04/28 17:41:31 bouyer Exp $ - -SHA1 (xen-3.0.4_1-src.tgz) = 7ca5af70996215229e143c7563e69b3719284a95 -RMD160 (xen-3.0.4_1-src.tgz) = f869eec35f6afe0bc9824ce2eb4a600f789d423b -Size (xen-3.0.4_1-src.tgz) = 6473636 bytes -SHA1 (patch-aa) = ec0d50bc37964925b6187bd8411b97610639fbff -SHA1 (patch-ab) = 6582707aadea19025ed1c60fbe04df5ab55bc9ef -SHA1 (patch-ac) = 4ab978d7966199d9968ad6c917e93118df37cf32 -SHA1 (patch-ad) = 455ebda50b25b5a1af8043b48ba55dc92f0594e1 -SHA1 (patch-al) = 4b3e40228e10b9d9076b501376edb74719af3459 -SHA1 (patch-as) = 2ad346d02a0657d49df15561366d5f34d6eca9fa -SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b -SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373 -SHA1 (patch-aw) = c49dc2c96398c178c190a4e3c911a8bb3517ff5d -SHA1 (patch-ax) = c2fd0f25ed00498039eececcfb467a236f608efa -SHA1 (patch-ba) = 08578f0b605abf339ba1798110723d8da7117e01 -SHA1 (patch-bb) = 9cc5b605797b6efae7f2cab570d43205278ab881 -SHA1 (patch-bc) = c143c3c587f254af1552667a70e2fac1f0f9665e -SHA1 (patch-be) = dc8e2a96f39cb540eece35468e2e055201c80220 -SHA1 (patch-bf) = 8b4ecb5cc6c92e3b52574f725f577df062c4f147 -SHA1 (patch-bg) = 3d390a3155db6a1f9c910868b7f615c2f270dc4d -SHA1 (patch-bh) = c9719a85d84268fab81da989b06c7eca341bb6f9 -SHA1 (patch-bm) = 76af5ab6caa1e59a486b2d06e50fae883e515e33 -SHA1 (patch-bo) = 0fc2946c6e46b0ce2c2a62824b26edbc8c32cb61 -SHA1 (patch-br) = 906ac9598808f7e9677a04bbe159d174ea6f8b9a -SHA1 (patch-bs) = 3d9340587bf54f6cec5ab02a9c423ecb25661be8 -SHA1 (patch-bt) = d1cfab2ccf14d3df0fdda4c4699258997d2eb5d2 -SHA1 (patch-bw) = d4bdb0dcc48cabefb568042d3b58822f8251b1bd -SHA1 (patch-cb) = 0bf2513749e28ff955caabd76bf79dd8280b61ed -SHA1 (patch-cc) = a8986fe54de5508a2e1372df415ab29b30a71ef1 -SHA1 (patch-cd) = 8fc057e9dc98e356ba46cdf183a8891c59c005b8 -SHA1 (patch-cf) = 2c1f83cfd1de238c81796762cf60560e64e0f630 -SHA1 (patch-cg) = 26aa623c34b8b0aebffd93451291264ad7d99c94 -SHA1 (patch-ch) = ae8b11cd22c2cf0c5f2c0a603e80dadad1012b59 -SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577 -SHA1 (patch-cj) = 166e2190a31bba842da1111310ba7b1ad35a5d81 -SHA1 (patch-ck) = 3783d9b4b9344670bae2f35e2ac7f11e2ec9ce7b -SHA1 (patch-cl) = f7456d0692331a86d31e83b71bcb72d35979e0d1 -SHA1 (patch-cm) = 802d395f1dc391a827487bbc9fcfe2bbd6af07de -SHA1 (patch-cn) = 40ae04194cca94b112133e962d4cf7487412925a -SHA1 (patch-co) = 470535c84115dc3d96ec7e30d1e5c2380af27133 diff --git a/sysutils/xentools30/files/NetBSD.mk b/sysutils/xentools30/files/NetBSD.mk deleted file mode 100644 index b4af32ee5d0..00000000000 --- a/sysutils/xentools30/files/NetBSD.mk +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: NetBSD.mk,v 1.1 2007/04/28 17:14:50 bouyer Exp $ -include $(XEN_ROOT)/config/StdGNU.mk diff --git a/sysutils/xentools30/files/block-nbsd b/sysutils/xentools30/files/block-nbsd deleted file mode 100644 index f8d334247ba..00000000000 --- a/sysutils/xentools30/files/block-nbsd +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -e - -# $NetBSD: block-nbsd,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $ -# Called by xenbackendd -# Usage: block xsdir_backend_path state - -PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin -export PATH - -error() { - echo "$@" >&2 - xenstore_write $xpath/hotplug-status error - exit 1 -} - - -xpath=$1 -xstatus=$2 -xtype=$(xenstore-read "$xpath/type") -xparams=$(xenstore-read "$xpath/params") - -case $xstatus in -6) - # device removed - case $xtype in - file) - vnd=$(xenstore-read "$xpath/vnd" || echo none) - if [ $vnd != none ]; then - vnconfig -u $vnd - fi - ;; - phy) - ;; - *) - echo "unknown type $xtype" >&2 - ;; - esac - xenstore-rm $xpath - exit 0 - ;; -2) - case $xtype in - file) - # Store the list of available vnd(4) devices in - #``available_disks'', and mark them as ``free''. - list=`ls -1 /dev/vnd[0-9]*d | sed "s,/dev/vnd,,;s,d,," | sort -n` - for i in $list; do - disk="vnd$i" - available_disks="$available_disks $disk" - eval $disk=free - done - # Mark the used vnd(4) devices as ``used''. - for disk in `sysctl hw.disknames`; do - case $disk in - vnd[0-9]*) eval $disk=used ;; - esac - done - # Configure the first free vnd(4) device. - for disk in $available_disks; do - eval status=\$$disk - if [ "$status" = "free" ] && \ - vnconfig /dev/${disk}d $xparams >/dev/null; then - device=/dev/${disk}d - echo vnconfig /dev/${disk}d $xparams - break - fi - done - if [ x$device = x ] ; then - error "no available vnd device" - fi - echo xenstore-write $xpath/vnd $device - xenstore-write $xpath/vnd $device - ;; - phy) - device=$xparams - ;; - esac - physical_device=$(stat -f '%r' "$device") - echo xenstore-write $xpath/physical-device $physical_device - xenstore-write $xpath/physical-device $physical_device - echo xenstore-write $xpath/hotplug-status connected - xenstore-write $xpath/hotplug-status connected - exit 0 - ;; -*) - exit 0 - ;; -esac diff --git a/sysutils/xentools30/files/netbsd1-nbsd b/sysutils/xentools30/files/netbsd1-nbsd deleted file mode 100644 index 90883c018d1..00000000000 --- a/sysutils/xentools30/files/netbsd1-nbsd +++ /dev/null @@ -1,48 +0,0 @@ -# -*- mode: python; -*- -#============================================================================ -# Python configuration setup for 'xm create'. -# This script sets the parameters used when a domain is created using 'xm create'. -# You use a separate script for each domain you want to create, or -# you can set the parameters for the domain on the xm command line. -#============================================================================ - -#---------------------------------------------------------------------------- -# Kernel image file. -kernel = "/usr/pkg/etc/xen/kernels/netbsd-XEN3_DOMU.gz" -#kernel = "/usr/pkg/etc/xen/kernels/netbsd-INSTALL_XEN3_DOMU.gz" - -# Initial memory allocation (in megabytes) for the new domain. -memory = 256 - -# A name for your domain. All domains must have different names. -name = "netbsd1" - -#---------------------------------------------------------------------------- -# network configuration. -# The mac address is optionnal, it will use a random one if not specified. -# By default we create a bridged configuration; when a vif is created -# the script @PKG_SYSCONFDIR@/scripts/vif-bridge is called to connect -# the bridge to the designated bridge (the bridge should already be up) -vif = [ 'mac=00:16:3e:00:00:11, bridge=bridge0' ] - -#it's possible to use a different script when the vif is created; -# for example to use a routed setup instead of bridged: -# vif = [ 'mac=00:16:3e:00:00:11, ip=10.0.0.1 netmask 255.255.255.0, script=vif-ip' ] - -#---------------------------------------------------------------------------- -# Define the disk devices you want the domain to have access to, and -# what you want them accessible as. -# Each disk entry is of the form phy:UNAME,DEV,MODE -# where UNAME is the device, DEV is the device name the domain will see, -# and MODE is r for read-only, w for read-write. -# For NetBSD guest DEV doesn't matter, so we can just use increasing numbers -# here. For linux guests you have to use a linux device name (e.g. hda1) -# or the corresponding device number (e.g 0x301 for hda1) - -disk = [ 'file:/home/domains/netbsd1,0x1,w' ] - -#---------------------------------------------------------------------------- -# Boot parameters (e.g. -s, -a, ...) -extra = "" - -#============================================================================ diff --git a/sysutils/xentools30/files/vif-bridge-nbsd b/sysutils/xentools30/files/vif-bridge-nbsd deleted file mode 100644 index 602ecec180c..00000000000 --- a/sysutils/xentools30/files/vif-bridge-nbsd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -e - -# $NetBSD: vif-bridge-nbsd,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $ -# Called by xenbackendd -# Usage: vif-bridge xsdir_backend_path state - -PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin -export PATH - -xpath=$1 -xstatus=$2 - -case $xstatus in -6) - # device removed - xenstore-rm $xpath - exit 0 - ;; -2) - xbridge=$(xenstore-read "$xpath/bridge") - xfid=$(xenstore-read "$xpath/frontend-id") - xhandle=$(xenstore-read "$xpath/handle") - iface=xvif$xfid.$xhandle - echo ifconfig $iface up - ifconfig $iface up - brconfig $xbridge add $iface - echo brconfig $xbridge add $iface - xenstore-write $xpath/hotplug-status connected - echo xenstore-write $xpath/hotplug-status connected - exit 0 - ;; -*) - exit 0 - ;; -esac diff --git a/sysutils/xentools30/files/vif-ip-nbsd b/sysutils/xentools30/files/vif-ip-nbsd deleted file mode 100755 index 26594100655..00000000000 --- a/sysutils/xentools30/files/vif-ip-nbsd +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -e - -# $NetBSD: vif-ip-nbsd,v 1.1 2006/10/19 22:57:13 bouyer Exp $ -# Called by xenbackendd -# Usage: vif-ip xsdir_backend_path state - -PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin -export PATH - -xpath=$1 -xstatus=$2 - -case $xstatus in -6) - # device removed - xenstore-rm $xpath - exit 0 - ;; -2) - xip=$(xenstore-read "$xpath/ip") - xfid=$(xenstore-read "$xpath/frontend-id") - xhandle=$(xenstore-read "$xpath/handle") - iface=xvif$xfid.$xhandle - echo ifconfig $iface $xip up - ifconfig $iface $xip up - xenstore-write $xpath/hotplug-status connected - echo xenstore-write $xpath/hotplug-status connected - exit 0 - ;; -*) - exit 0 - ;; -esac diff --git a/sysutils/xentools30/files/xenbackendd.c b/sysutils/xentools30/files/xenbackendd.c deleted file mode 100644 index d9eda55f70c..00000000000 --- a/sysutils/xentools30/files/xenbackendd.c +++ /dev/null @@ -1,319 +0,0 @@ -/* $NetBSD: xenbackendd.c,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $ */ -/* - * Copyright (C) 2006 Manuel bouyer - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/wait.h> -#include <unistd.h> -#include <stdlib.h> -#include <fcntl.h> -#include <err.h> -#include <errno.h> -#include <stdio.h> -#include <getopt.h> -#include <stdbool.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <string.h> -#include <syslog.h> -#include <stdarg.h> - -#include <xenctrl.h> -#include <xs.h> - -#define DEVTYPE_UNKNOWN 0 -#define DEVTYPE_VIF 1 -#define DEVTYPE_VBD 2 - -#define DOMAIN_PATH "/local/domain/0" - -#ifndef VBD_SCRIPT -#define VBD_SCRIPT "/usr/pkg/etc/xen/scripts/block" -#endif -#ifndef LOG_FILE -#define LOG_FILE "/var/log/xenbackendd.log" -#endif -#ifndef PID_FILE -#define PID_FILE "/var/run/xenbackendd.pid" -#endif - - -struct xs_handle *xs; -int xc; - -int xen_setup(void); -void dolog(int, const char *, ...); -void dodebug(const char *, ...); -void doexec(const char *, const char *, const char *); -void usage(void); - -int fflag = 0; -int dflag = 0; - -const char *vbd_script = NULL; -const char *log_file = NULL; -const char *pidfile = NULL; -int -main(int argc, char * const argv[]) -{ - char **vec; - unsigned int num; - int i; - char *s; - int state; - char *sstate; - char *p; - char buf[80]; - int type = DEVTYPE_UNKNOWN; - extern char *optarg; - extern int optind; - int ch; - int debug_fd; - FILE *pidfile_f; - - while ((ch = getopt(argc, argv, "dfl:p:s:")) != -1) { - switch (ch) { - case 'd': - dflag = 1; - break; - case 'f': - fflag = 1; - break; - case 'l': - log_file = optarg; - break; - case 'p': - pidfile = pidfile; - case 's': - vbd_script = optarg; - break; - default: - usage(); - } - } - - if (vbd_script == NULL) - vbd_script = VBD_SCRIPT; - if (pidfile == NULL) - pidfile = PID_FILE; - if (log_file == NULL) - log_file = LOG_FILE; - - openlog("xenbackendd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - - if (fflag == 0) { - /* open log file */ - debug_fd = open(log_file, O_RDWR | O_CREAT | O_TRUNC, 0644); - if (debug_fd == -1) { - dolog(LOG_ERR, "can't open %s: %s", - log_file, strerror(errno)); - exit(1); - } - } - - if (fflag == 0) { - /* daemonize */ - pidfile_f = fopen(pidfile, "w"); - if (pidfile_f == NULL) { - dolog(LOG_ERR, "can't open %s: %s", - pidfile, strerror(errno)); - exit(1); - } - if (daemon(0, 0) < 0) { - dolog(LOG_ERR, "can't daemonize: %s", - strerror(errno)); - exit(1); - } - fprintf(pidfile_f, "%d\n", (int)getpid()); - fclose(pidfile_f); - /* retirect stderr to log file */ - if (dup2(debug_fd, STDERR_FILENO) < 0) { - dolog(LOG_ERR, "can't redirect stderr to %s: %s\n", - log_file, strerror(errno)); - exit(1); - } - /* also redirect stdout if we're in debug mode */ - if (dflag) { - if (dup2(debug_fd, STDOUT_FILENO) < 0) { - dolog(LOG_ERR, - "can't redirect stdout to %s: %s\n", - log_file, strerror(errno)); - exit(1); - } - } - close(debug_fd); - debug_fd = -1; - } - - if (xen_setup() < 0) { - exit(1); - } - - while (1) { - vec = xs_read_watch(xs, &num); - if (!vec) { - dolog(LOG_ERR, "xs_read_watch: NULL\n"); - continue; - } - if (strlen(vec[XS_WATCH_PATH]) < sizeof("state")) - goto next1; - /* find last component of path, check if it's "state" */ - p = &vec[XS_WATCH_PATH][ - strlen(vec[XS_WATCH_PATH]) - sizeof("state")]; - if (p[0] != '/') - goto next1; - p[0] = '\0'; - p++; - if (strcmp(p, "state") != 0) - goto next1; - snprintf(buf, sizeof(buf), "%s/state", vec[XS_WATCH_PATH]); - sstate = xs_read(xs, XBT_NULL, buf, 0); - if (sstate == NULL) { - dolog(LOG_ERR, - "Failed to read %s (%s)", buf, strerror(errno)); - goto next1; - } - state = atoi(sstate); - snprintf(buf, sizeof(buf), "%s/hotplug-status", - vec[XS_WATCH_PATH]); - s = xs_read(xs, XBT_NULL, buf, 0); - if (s != NULL && state != 6 /* XenbusStateClosed */) - goto next2; - if (strncmp(vec[XS_WATCH_PATH], - DOMAIN_PATH "/backend/vif", - strlen(DOMAIN_PATH "/backend/vif")) == 0) - type = DEVTYPE_VIF; - if (strncmp(vec[XS_WATCH_PATH], - DOMAIN_PATH "/backend/vbd", - strlen(DOMAIN_PATH "/backend/vbd")) == 0) - type = DEVTYPE_VBD; - switch(type) { - case DEVTYPE_VIF: - if (s) - free(s); - snprintf(buf, sizeof(buf), "%s/script", - vec[XS_WATCH_PATH]); - s = xs_read(xs, XBT_NULL, buf, 0); - if (s == NULL) { - dolog(LOG_ERR, - "Failed to read %s (%s)", buf, - strerror(errno)); - goto next2; - } - doexec(s, vec[XS_WATCH_PATH], sstate); - break; - case DEVTYPE_VBD: - doexec(vbd_script, vec[XS_WATCH_PATH], sstate); - break; - default: - break; - } -next2: - if (s) - free(s); - free(sstate); -next1: - free(vec); - } -} - -void -dolog(int pri, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); - fflush(stderr); - va_start(ap, fmt); - vsyslog(pri, fmt, ap); - va_end(ap); -} - -void -dodebug(const char *fmt, ...) -{ - va_list ap; - - if (dflag == 0) - return; - va_start(ap, fmt); - vfprintf(stdout, fmt, ap); - va_end(ap); - printf("\n"); - fflush(stdout); -} - -int -xen_setup(void) -{ - - xs = xs_daemon_open(); - if (xs == NULL) { - dolog(LOG_ERR, - "Failed to contact xenstore (%s). Is it running?", - strerror(errno)); - goto out; - } - - xc = xc_interface_open(); - if (xc == -1) { - dolog(LOG_ERR, "Failed to contact hypervisor (%s)", - strerror(errno)); - goto out; - } - if (!xs_watch(xs, DOMAIN_PATH, "backend")) { - dolog(LOG_ERR, "xenstore watch on backend fails."); - goto out; - } - return 0; - out: - if (xs) - xs_daemon_close(xs); - if (xc != -1) - xc_interface_close(xc); - return -1; -} - -void -doexec(const char *cmd, const char *arg1, const char *arg2) -{ - dodebug("exec %s %s %s", cmd, arg1, arg2); - switch(vfork()) { - case -1: - dolog(LOG_ERR, "can't vfork: %s", strerror(errno)); - break; - case 0: - execl(cmd, cmd, arg1, arg2, NULL); - dolog(LOG_ERR, "can't exec %s: %s", cmd, strerror(errno)); - exit(1); - break; - default: - wait(NULL); - break; - } -} - -void -usage() -{ - fprintf(stderr, "usage: %s [-d] [-f] [-l log_file] [-p pif_file] [-s vbd_script]\n", - getprogname()); - exit(1); -} diff --git a/sysutils/xentools30/files/xenbackendd.sh b/sysutils/xentools30/files/xenbackendd.sh deleted file mode 100644 index adb27fa08f8..00000000000 --- a/sysutils/xentools30/files/xenbackendd.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# $NetBSD: xenbackendd.sh,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $ -# - -# PROVIDE: xenbackendd -# REQUIRE: xend - -$_rc_subr_loaded . /etc/rc.subr - -name="xenbackendd" -rcvar=$name -command="@PREFIX@/sbin/${name}" -pidfile="/var/run/${name}.pid" - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/xentools30/files/xend.sh b/sysutils/xentools30/files/xend.sh deleted file mode 100644 index 868b807edd5..00000000000 --- a/sysutils/xentools30/files/xend.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: xend.sh,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $ -# -# PROVIDE: xend -# REQUIRE: disks network - -. /etc/rc.subr - -name="xend" -rcvar=$name -command="@PREFIX@/sbin/xend" -command_interpreter="@RCD_INTERPRETER@" -start_cmd="@ECHO@ Starting ${name}. && PATH=${PATH}:@PREFIX@/sbin ${command} start" -start_precmd="xen_precmd" -privcmd_path="@PROCPATH@/xen/privcmd" - -xen_precmd() -{ - if [ ! -f ${privcmd_path} ]; then - @ECHO@ "${name}: Cannot find ${privcmd_path}!" - exit 1 - fi - mkdir -p /var/run/xend || exit 1 - mkdir -p /var/run/xenstored || exit 1 -} - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/xentools30/files/xendomains.sh b/sysutils/xentools30/files/xendomains.sh deleted file mode 100644 index c3f35bb88db..00000000000 --- a/sysutils/xentools30/files/xendomains.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: xendomains.sh,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $ -# -# PROVIDE: xendomains -# REQUIRE: xenbackendd -# KEYWORD: shutdown -# -# xendomains This required variable is a whitespace-separated -# list of domains, e.g., xendomains="dom1 dom2 dom3". -# -# xendomains_config This optional variable is a format string that -# represents the path to the configuration file for -# each domain. "%s" is substituted with the name of -# the domain. The default is "@PKG_SYSCONFDIR@/%s". -# -# xendomains_prehook This optional variable is a format string that -# represents the command to run, if it exists, before -# starting each domain. "%s" is substituted with the -# name of the domain. The default is -# "@PKG_SYSCONFDIR@/%s-pre". -# -# xendomains_posthook This optional variable is a format string that -# represents the command to run, if it exists, after -# stopping each domain. "%s" is substituted with the -# name of the domain. The default is -# "@PKG_SYSCONFDIR@/%s-post". -# - -. /etc/rc.subr - -name="xendomains" -ctl_command="@PREFIX@/sbin/xm" -start_cmd="xendomains_start" -stop_cmd="xendomains_stop" -list_cmd="xendomains_list" -extra_commands="list" -privcmd_path="@PROCPATH@/xen/privcmd" - -xendomains_start() -{ - [ -n "$xendomains" ] || return - - if [ ! -f ${privcmd_path} ]; then - echo "${name}: Cannot find ${privcmd_path}!" - exit 1 - fi - - echo "Starting xen domains." - for domain in $xendomains; do - case "$domain" in - "") continue ;; - esac - - # Start off by running the pre-hook script if it's present. - if [ -n "${xendomains_prehook}" ]; then - cmdline=`printf "${xendomains_prehook}" $domain` - cmd="${cmdline%% *}" - if [ -x "$cmd" ]; then - $cmdline || echo "Pre-hook \`\`$cmdline'' failed... skipping $domain." - continue - fi - fi - - # Ask xend to create the domain. - if [ -n "${xendomains_config}" ]; then - file=`printf "${xendomains_config}" $domain` - if [ -f "$file" ]; then - ${ctl_command} create "$file" - fi - fi - done -} - -xendomains_list() { - # Output a whitespace-separated list of live guest domains. - ${ctl_command} list | awk ' - (FNR <= 2) { next } - ($5 !~ /s/) { s = s " " $1 } - END { sub(" *", "", s); print s }' -} - -xendomains_stop() -{ - # Determine an appropriate timeout waiting for all domains to - # stop -- always wait at least 60s, and add 5s per active domain. - # - numdomains=$(xendomains_list | awk '{ print NF }') - [ $numdomains -gt 0 ] || return - timeout=$((60 + numdomains * 5)) - - # Ask xend to stop every domain, and poll xend every 10s up to the - # timeout period to check if all the domains are stopped. We - # consider a domain in the "s" (shutdown) state to be stopped. - # - echo "Stopping xen domains." - for domain in $(xendomains_list); do - ${ctl_command} shutdown --halt $domain - done - while [ $timeout -gt 0 ]; do - livedomains=$(xendomains_list) - [ -n "$livedomains" ] || break - timeout=$((timeout - 10)) - sleep 10 - done - livedomains=$(xendomains_list) - if [ -n "$livedomains" ]; then - echo "Failed to stop: $livedomains" - else - echo "All domains stopped." - fi - - # Finish off by running the post-hook script if it's present. - for domain in $xendomains; do - case "$domain" in - "") continue ;; - esac - if [ -n "${xendomains_posthook}" ]; then - cmdline=`printf "${xendomains_posthook}" $domain` - cmd="${cmdline%% *}" - if [ -x "$cmd" ]; then - $cmdline || echo "Post-hook \`\`$cmdline'' failed." - fi - fi - done -} - -load_rc_config $name - -: ${xendomains_config="@PKG_SYSCONFDIR@/%s"} -: ${xendomains_prehook="@PKG_SYSCONFDIR@/%s-pre"} -: ${xendomains_posthook="@PKG_SYSCONFDIR@/%s-post"} - -run_rc_command "$1" diff --git a/sysutils/xentools30/files/xenio.h b/sysutils/xentools30/files/xenio.h deleted file mode 100644 index d670b414759..00000000000 --- a/sysutils/xentools30/files/xenio.h +++ /dev/null @@ -1,105 +0,0 @@ -/* NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $ */ - -/****************************************************************************** - * privcmd.h - * - * Copyright (c) 2003-2004, K A Fraser - * - * This file may be distributed separately from the Linux kernel, or - * incorporated into other software packages, subject to the following license: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this source file (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#ifndef __NetBSD_PRIVCMD_H__ -#define __NetBSD_PRIVCMD_H__ - -/* Interface to /proc/xen/privcmd */ - -typedef struct privcmd_hypercall -{ - unsigned long op; - unsigned long arg[5]; -} privcmd_hypercall_t; - -typedef struct privcmd_mmap_entry { - unsigned long va; - unsigned long mfn; - unsigned long npages; -} privcmd_mmap_entry_t; - -typedef struct privcmd_mmap { - int num; - domid_t dom; /* target domain */ - privcmd_mmap_entry_t *entry; -} privcmd_mmap_t; - -typedef struct privcmd_mmapbatch { - int num; /* number of pages to populate */ - domid_t dom; /* target domain */ - unsigned long addr; /* virtual address */ - unsigned long *arr; /* array of mfns - top nibble set on err */ -} privcmd_mmapbatch_t; - -typedef struct privcmd_blkmsg -{ - unsigned long op; - void *buf; - int buf_size; -} privcmd_blkmsg_t; - -/* - * @cmd: IOCTL_PRIVCMD_HYPERCALL - * @arg: &privcmd_hypercall_t - * Return: Value returned from execution of the specified hypercall. - */ -#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 \ - _IOR('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) -/* EVTCHN_BIND: Bind to the specified event-channel port. */ -#define EVTCHN_BIND _IOW('E', 2, unsigned long) -/* EVTCHN_UNBIND: Unbind from the specified event-channel port. */ -#define EVTCHN_UNBIND _IOW('E', 3, unsigned long) - -#endif /* __NetBSD_PRIVCMD_H__ */ diff --git a/sysutils/xentools30/files/xenio3.h b/sysutils/xentools30/files/xenio3.h deleted file mode 100644 index 6a54e8b3790..00000000000 --- a/sysutils/xentools30/files/xenio3.h +++ /dev/null @@ -1,89 +0,0 @@ -/* $NetBSD: xenio3.h,v 1.2 2006/10/19 22:57:13 bouyer Exp $ */ -/****************************************************************************** - * evtchn.h - * - * Interface to /dev/xen/evtchn. - * - * Copyright (c) 2003-2005, K A Fraser - * - * This file may be distributed separately from the Linux kernel, or - * incorporated into other software packages, subject to the following license: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this source file (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#ifndef __NetBSD_XENIO3_H__ -#define __NetBSD_XENIO3_H__ - -/* - * Bind a fresh port to VIRQ @virq. - * Return allocated port. - */ -#define IOCTL_EVTCHN_BIND_VIRQ \ - _IOWR('E', 4, struct ioctl_evtchn_bind_virq) -struct ioctl_evtchn_bind_virq { - unsigned int virq; - unsigned int port; -}; - -/* - * Bind a fresh port to remote <@remote_domain, @remote_port>. - * Return allocated port. - */ -#define IOCTL_EVTCHN_BIND_INTERDOMAIN \ - _IOWR('E', 5, struct ioctl_evtchn_bind_interdomain) -struct ioctl_evtchn_bind_interdomain { - unsigned int remote_domain, remote_port; - unsigned int port; -}; - -/* - * Allocate a fresh port for binding to @remote_domain. - * Return allocated port. - */ -#define IOCTL_EVTCHN_BIND_UNBOUND_PORT \ - _IOWR('E', 6, struct ioctl_evtchn_bind_unbound_port) -struct ioctl_evtchn_bind_unbound_port { - unsigned int remote_domain; - unsigned int port; -}; - -/* - * Unbind previously allocated @port. - */ -#define IOCTL_EVTCHN_UNBIND \ - _IOW('E', 7, struct ioctl_evtchn_unbind) -struct ioctl_evtchn_unbind { - unsigned int port; -}; - -/* - * Send event to previously allocated @port. - */ -#define IOCTL_EVTCHN_NOTIFY \ - _IOW('E', 8, struct ioctl_evtchn_notify) -struct ioctl_evtchn_notify { - unsigned int port; -}; - -/* Clear and reinitialise the event buffer. Clear error condition. */ -#define IOCTL_EVTCHN_RESET \ - _IO('E', 9) - -#endif /* __NetBSD_XENIO3_H__ */ diff --git a/sysutils/xentools30/patches/patch-aa b/sysutils/xentools30/patches/patch-aa deleted file mode 100644 index 71eabebab1d..00000000000 --- a/sysutils/xentools30/patches/patch-aa +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2007/04/28 17:14:50 bouyer Exp $ - ---- Makefile.orig 2007-01-08 16:00:46.000000000 +0100 -+++ Makefile 2007-04-25 18:22:10.000000000 +0200 -@@ -5,27 +5,18 @@ - SUBDIRS-y += libxc - SUBDIRS-y += xenstore - SUBDIRS-y += misc --SUBDIRS-y += examples --SUBDIRS-y += xentrace - SUBDIRS-$(CONFIG_XCUTILS) += xcutils --SUBDIRS-$(CONFIG_X86) += firmware - SUBDIRS-y += security - SUBDIRS-y += console --SUBDIRS-y += xenmon --SUBDIRS-y += guest-headers - SUBDIRS-$(VTPM_TOOLS) += vtpm_manager - SUBDIRS-$(VTPM_TOOLS) += vtpm - SUBDIRS-y += xenstat --SUBDIRS-y += libaio --SUBDIRS-y += blktap --SUBDIRS-y += libfsimage - SUBDIRS-$(XENFB_TOOLS) += xenfb - SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen - - # These don't cross-compile - ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) - SUBDIRS-y += python --SUBDIRS-y += pygrub - endif - - .PHONY: all -@@ -33,34 +24,27 @@ - @set -e; for subdir in $(SUBDIRS-y); do \ - $(MAKE) -C $$subdir $@; \ - done -- $(MAKE) ioemu - - .PHONY: install - install: check - @set -e; for subdir in $(SUBDIRS-y); do \ - $(MAKE) -C $$subdir $@; \ - done -- $(MAKE) ioemuinstall -- $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump -- $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen - - .PHONY: clean - clean: check_clean - @set -e; for subdir in $(SUBDIRS-y); do \ - $(MAKE) -C $$subdir $@; \ - done -- $(MAKE) ioemuclean - - .PHONY: distclean - distclean: clean - - .PHONY: check - check: -- $(MAKE) -C check - - .PHONY: check_clean - check_clean: -- $(MAKE) -C check clean - - .PHONY: ioemu ioemuinstall ioemuclean - ifeq ($(CONFIG_IOEMU),y) diff --git a/sysutils/xentools30/patches/patch-ab b/sysutils/xentools30/patches/patch-ab deleted file mode 100644 index 471e266eb74..00000000000 --- a/sysutils/xentools30/patches/patch-ab +++ /dev/null @@ -1,269 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- /dev/null 2006-10-17 00:01:34.000000000 +0200 -+++ libxc/xc_netbsd.c 2006-10-17 00:05:12.000000000 +0200 -@@ -0,0 +1,264 @@ -+/****************************************************************************** -+ * -+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#include "xc_private.h" -+ -+#include <xen/memory.h> -+#include <xen/NetBSD/xenio3.h> -+#include <unistd.h> -+#include <fcntl.h> -+ -+int xc_interface_open(void) -+{ -+ int flags, saved_errno; -+ int fd = open("/kern/xen/privcmd", O_RDWR); -+ -+ if ( fd == -1 ) -+ { -+ PERROR("Could not obtain handle on privileged command interface"); -+ return -1; -+ } -+ -+ /* Although we return the file handle as the 'xc handle' the API -+ does not specify / guarentee that this integer is in fact -+ a file handle. Thus we must take responsiblity to ensure -+ it doesn't propagate (ie leak) outside the process */ -+ if ( (flags = fcntl(fd, F_GETFD)) < 0 ) -+ { -+ PERROR("Could not get file handle flags"); -+ goto error; -+ } -+ flags |= FD_CLOEXEC; -+ if ( fcntl(fd, F_SETFD, flags) < 0 ) -+ { -+ PERROR("Could not set file handle flags"); -+ goto error; -+ } -+ -+ return fd; -+ -+ error: -+ saved_errno = errno; -+ close(fd); -+ errno = saved_errno; -+ return -1; -+} -+ -+int xc_interface_close(int xc_handle) -+{ -+ return close(xc_handle); -+} -+ -+void *xc_map_foreign_batch(int xc_handle, uint32_t dom, int prot, -+ xen_pfn_t *arr, int num) -+{ -+ privcmd_mmapbatch_t ioctlx; -+ void *addr; -+ addr = mmap(NULL, num*PAGE_SIZE, prot, MAP_ANON | MAP_SHARED, -1, 0); -+ if ( addr == MAP_FAILED ) -+ return NULL; -+ -+ ioctlx.num=num; -+ ioctlx.dom=dom; -+ ioctlx.addr=(unsigned long)addr; -+ ioctlx.arr=arr; -+ if ( ioctl(xc_handle, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 ) -+ { -+ int saved_errno = errno; -+ perror("XXXXXXXX"); -+ (void)munmap(addr, num*PAGE_SIZE); -+ errno = saved_errno; -+ return NULL; -+ } -+ return addr; -+ -+} -+ -+void *xc_map_foreign_range(int xc_handle, uint32_t dom, -+ int size, int prot, -+ unsigned long mfn) -+{ -+ privcmd_mmap_t ioctlx; -+ privcmd_mmap_entry_t entry; -+ void *addr; -+ addr = mmap(NULL, size, prot, MAP_ANON | MAP_SHARED, -1, 0); -+ if ( addr == MAP_FAILED ) -+ return NULL; -+ -+ ioctlx.num=1; -+ ioctlx.dom=dom; -+ ioctlx.entry=&entry; -+ entry.va=(unsigned long) addr; -+ entry.mfn=mfn; -+ entry.npages=(size+PAGE_SIZE-1)>>PAGE_SHIFT; -+ if ( ioctl(xc_handle, IOCTL_PRIVCMD_MMAP, &ioctlx) < 0 ) -+ { -+ int saved_errno = errno; -+ (void)munmap(addr, size); -+ errno = saved_errno; -+ return NULL; -+ } -+ return addr; -+} -+ -+int xc_map_foreign_ranges(int xc_handle, uint32_t dom, -+ privcmd_mmap_entry_t *entries, int nr) -+{ -+ privcmd_mmap_t ioctlx; -+ int err; -+ -+ ioctlx.num = nr; -+ ioctlx.dom = dom; -+ ioctlx.entry = entries; -+ -+ err = ioctl(xc_handle, IOCTL_PRIVCMD_MMAP, &ioctlx); -+ if (err == 0) -+ return 0; -+ else -+ return -errno; -+} -+ -+static int do_privcmd(int xc_handle, unsigned int cmd, unsigned long data) -+{ -+ int err = ioctl(xc_handle, cmd, data); -+ if (err == 0) -+ return 0; -+ else -+ return -errno; -+} -+ -+int do_xen_hypercall(int xc_handle, privcmd_hypercall_t *hypercall) -+{ -+ return do_privcmd(xc_handle, -+ IOCTL_PRIVCMD_HYPERCALL, -+ (unsigned long)hypercall); -+} -+ -+#ifdef __NetBSD__ -+#define EVTCHN_DEV_NAME "/dev/xenevt" -+#else -+#define EVTCHN_DEV_NAME "/dev/xen/evtchn" -+#define EVTCHN_DEV_MAJOR 10 -+#define EVTCHN_DEV_MINOR 201 -+#endif -+ -+int xc_evtchn_open(void) -+{ -+ return open(EVTCHN_DEV_NAME, O_NONBLOCK|O_RDWR); -+} -+ -+int xc_evtchn_close(int xce_handle) -+{ -+ return close(xce_handle); -+} -+ -+int xc_evtchn_fd(int xce_handle) -+{ -+ return xce_handle; -+} -+ -+int xc_evtchn_notify(int xce_handle, evtchn_port_t port) -+{ -+ struct ioctl_evtchn_notify notify; -+ -+ notify.port = port; -+ -+ return ioctl(xce_handle, IOCTL_EVTCHN_NOTIFY, ¬ify); -+} -+ -+evtchn_port_t xc_evtchn_bind_interdomain(int xce_handle, int domid, -+ evtchn_port_t remote_port) -+{ -+ struct ioctl_evtchn_bind_interdomain bind; -+ int ret; -+ -+ bind.remote_domain = domid; -+ bind.remote_port = remote_port; -+ -+ ret = ioctl(xce_handle, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind); -+ if (ret == 0) -+ return bind.port; -+ else -+ return -1; -+} -+ -+int xc_evtchn_unbind(int xce_handle, evtchn_port_t port) -+{ -+ struct ioctl_evtchn_unbind unbind; -+ -+ unbind.port = port; -+ -+ return ioctl(xce_handle, IOCTL_EVTCHN_UNBIND, &unbind); -+} -+ -+evtchn_port_t xc_evtchn_bind_virq(int xce_handle, unsigned int virq) -+{ -+ struct ioctl_evtchn_bind_virq bind; -+ int err; -+ -+ bind.virq = virq; -+ -+ err = ioctl(xce_handle, IOCTL_EVTCHN_BIND_VIRQ, &bind); -+ if (err) -+ return -1; -+ else -+ return bind.port; -+} -+ -+static int dorw(int fd, char *data, size_t size, int do_write) -+{ -+ size_t offset = 0; -+ ssize_t len; -+ -+ while ( offset < size ) -+ { -+ if (do_write) -+ len = write(fd, data + offset, size - offset); -+ else -+ len = read(fd, data + offset, size - offset); -+ -+ if ( len == -1 ) -+ { -+ if ( errno == EINTR ) -+ continue; -+ return -1; -+ } -+ -+ offset += len; -+ } -+ -+ return 0; -+} -+ -+evtchn_port_t xc_evtchn_pending(int xce_handle) -+{ -+ evtchn_port_t port; -+ -+ if ( dorw(xce_handle, (char *)&port, sizeof(port), 0) == -1 ) -+ return -1; -+ -+ return port; -+} -+ -+int xc_evtchn_unmask(int xce_handle, evtchn_port_t port) -+{ -+ return dorw(xce_handle, (char *)&port, sizeof(port), 1); -+} -+ -+/* -+ * Local variables: -+ * mode: C -+ * c-set-style: "BSD" -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * indent-tabs-mode: nil -+ * End: -+ */ diff --git a/sysutils/xentools30/patches/patch-ac b/sysutils/xentools30/patches/patch-ac deleted file mode 100644 index 86c59477fb0..00000000000 --- a/sysutils/xentools30/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2007/04/28 17:14:50 bouyer Exp $ - ---- libxc/xc_linux_save.c.orig 2007-01-08 16:00:49.000000000 +0100 -+++ libxc/xc_linux_save.c 2007-04-25 18:23:32.000000000 +0200 -@@ -528,7 +528,7 @@ - } - - if ((m2p = mmap(NULL, m2p_size, prot, -- MAP_SHARED, xc_handle, 0)) == MAP_FAILED) { -+ MAP_ANON | MAP_SHARED, xc_handle, 0)) == MAP_FAILED) { - ERROR("failed to mmap m2p"); - return NULL; - } diff --git a/sysutils/xentools30/patches/patch-ad b/sysutils/xentools30/patches/patch-ad deleted file mode 100644 index 884bd714bbe..00000000000 --- a/sysutils/xentools30/patches/patch-ad +++ /dev/null @@ -1,161 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2007/04/28 17:14:51 bouyer Exp $ - ---- libxc/xc_private.c.orig 2007-01-08 16:00:49.000000000 +0100 -+++ libxc/xc_private.c 2007-04-25 23:06:39.000000000 +0200 -@@ -10,7 +10,12 @@ - #include <stdarg.h> - #include <pthread.h> - --static __thread xc_error last_error = { XC_ERROR_NONE, ""}; -+static pthread_key_t last_error_pkey; -+static pthread_once_t last_error_pkey_once = PTHREAD_ONCE_INIT; -+ -+static pthread_key_t errbuf_pkey; -+static pthread_once_t errbuf_pkey_once = PTHREAD_ONCE_INIT; -+ - #if DEBUG - static xc_error_handler error_handler = xc_default_error_handler; - #else -@@ -23,15 +28,44 @@ - fprintf(stderr, "ERROR %s: %s\n", desc, err->message); - } - -+static void -+_xc_clean_last_error(void *m) -+{ -+ if (m) -+ free(m); -+ pthread_setspecific(last_error_pkey, NULL); -+} -+ -+static void -+_xc_init_last_error(void) -+{ -+ pthread_key_create(&last_error_pkey, _xc_clean_last_error); -+} -+ -+static xc_error * -+_xc_get_last_error(void) { -+ xc_error *last_error; -+ -+ pthread_once(&last_error_pkey_once, _xc_init_last_error); -+ -+ last_error = pthread_getspecific(last_error_pkey); -+ if (last_error == NULL) { -+ last_error = malloc(sizeof(xc_error)); -+ pthread_setspecific(last_error_pkey, last_error); -+ } -+ return last_error; -+} -+ - const xc_error const *xc_get_last_error(void) - { -- return &last_error; -+ return _xc_get_last_error(); - } - - void xc_clear_last_error(void) - { -- last_error.code = XC_ERROR_NONE; -- last_error.message[0] = '\0'; -+ xc_error *last_error = _xc_get_last_error(); -+ last_error->code = XC_ERROR_NONE; -+ last_error->message[0] = '\0'; - } - - const char *xc_error_code_to_desc(int code) -@@ -60,9 +94,10 @@ - - static void _xc_set_error(int code, const char *msg) - { -- last_error.code = code; -- strncpy(last_error.message, msg, XC_MAX_ERROR_MSG_LEN - 1); -- last_error.message[XC_MAX_ERROR_MSG_LEN-1] = '\0'; -+ xc_error *last_error = _xc_get_last_error(); -+ last_error->code = code; -+ strncpy(last_error->message, msg, XC_MAX_ERROR_MSG_LEN - 1); -+ last_error->message[XC_MAX_ERROR_MSG_LEN-1] = '\0'; - } - - void xc_set_error(int code, const char *fmt, ...) -@@ -80,23 +115,29 @@ - - errno = saved_errno; - -- if ( error_handler != NULL ) -- error_handler(&last_error); -+ if ( error_handler != NULL ) { -+ xc_error *last_error = _xc_get_last_error(); -+ error_handler(last_error); -+ } - } - - int lock_pages(void *addr, size_t len) - { - int e = 0; -+ void *laddr = (void *)((u_long)addr & ~0xfffUL); -+ size_t llen = (len + 0xfffUL) & ~0xfffUL; - #ifndef __sun__ -- e = mlock(addr, len); -+ e = mlock(laddr, llen); - #endif - return (e); - } - - void unlock_pages(void *addr, size_t len) - { -+ void *laddr = (void *)((u_long)addr & ~0xfffUL); -+ size_t llen = (len + 0xfffUL) & ~0xfffUL; - #ifndef __sun__ -- safe_munlock(addr, len); -+ safe_munlock(laddr, llen); - #endif - } - -@@ -483,20 +524,43 @@ - return new_mfn; - } - -+static void -+_xc_clean_errbuf(void * m) -+{ -+ if (m) -+ free(m); -+ pthread_setspecific(errbuf_pkey, NULL); -+} -+ -+static void -+_xc_init_errbuf(void) -+{ -+ pthread_key_create(&errbuf_pkey, _xc_clean_errbuf); -+} -+ - char *safe_strerror(int errcode) - { -- static __thread char errbuf[32]; -+#define XS_BUFSIZE 32 -+ char *errbuf; - static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; - char *strerror_str; - -+ pthread_once(&errbuf_pkey_once, _xc_init_errbuf); -+ -+ errbuf = pthread_getspecific(errbuf_pkey); -+ if (errbuf == NULL) { -+ errbuf = malloc(XS_BUFSIZE); -+ pthread_setspecific(errbuf_pkey, errbuf); -+ } -+ - /* - * Thread-unsafe strerror() is protected by a local mutex. We copy - * the string to a thread-private buffer before releasing the mutex. - */ - pthread_mutex_lock(&mutex); - strerror_str = strerror(errcode); -- strncpy(errbuf, strerror_str, sizeof(errbuf)); -- errbuf[sizeof(errbuf)-1] = '\0'; -+ strncpy(errbuf, strerror_str, XS_BUFSIZE); -+ errbuf[XS_BUFSIZE-1] = '\0'; - pthread_mutex_unlock(&mutex); - - return errbuf; diff --git a/sysutils/xentools30/patches/patch-al b/sysutils/xentools30/patches/patch-al deleted file mode 100644 index a55a725aa70..00000000000 --- a/sysutils/xentools30/patches/patch-al +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-al,v 1.3 2007/04/28 17:14:51 bouyer Exp $ - ---- console/Makefile.orig 2007-01-08 16:00:47.000000000 +0100 -+++ console/Makefile 2007-04-25 22:09:45.000000000 +0200 -@@ -21,16 +21,17 @@ - $(RM) client/*.o daemon/*.o - - xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) -- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ - $(SOCKET_LIBS) -lxenctrl -lxenstore - - xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) -- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ - $(SOCKET_LIBS) -lxenctrl -lxenstore - - .PHONY: install - install: $(BIN) -- $(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR) -- $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR) -- $(INSTALL_DIR) -p $(DESTDIR)/$(CLIENT_INSTALL_DIR) -- $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR) -+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin -+ $(BSD_INSTALL_PROGRAM) xenconsoled $(PREFIX)/sbin -+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) xenconsole $(PREFIX)/bin -+ diff --git a/sysutils/xentools30/patches/patch-as b/sysutils/xentools30/patches/patch-as deleted file mode 100644 index 546672b5fcb..00000000000 --- a/sysutils/xentools30/patches/patch-as +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-as,v 1.3 2007/04/28 17:14:52 bouyer Exp $ - ---- libxc/Makefile.orig 2007-01-08 16:00:49.000000000 +0100 -+++ libxc/Makefile 2007-04-25 18:35:04.000000000 +0200 -@@ -19,6 +19,7 @@ - CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c - CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c - CTRL_SRCS-$(CONFIG_X86_Linux) += xc_ptrace.c xc_ptrace_core.c -+CTRL_SRCS-$(CONFIG_NetBSD) += xc_netbsd.c - - GUEST_SRCS-y := - GUEST_SRCS-y += xc_load_bin.c -@@ -74,19 +75,19 @@ - - .PHONY: install - install: build -- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR) -- [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include -- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR) -- $(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR) -- ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR) -- ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so -- $(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include -- -- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR) -- $(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR) -- ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR) -- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so -- $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include -+ $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib -+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/include -+ $(BSD_INSTALL_LIB) libxenctrl.so.$(MAJOR).$(MINOR) $(PREFIX)/lib -+ $(BSD_INSTALL_LIB) libxenctrl.a $(PREFIX)/lib -+ ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxenctrl.so.$(MAJOR) -+ ln -sf libxenctrl.so.$(MAJOR) $(PREFIX)/lib/libxenctrl.so -+ $(BSD_INSTALL_DATA) xenctrl.h $(PREFIX)/include -+ -+ $(BSD_INSTALL_LIB) libxenguest.so.$(MAJOR).$(MINOR) $(PREFIX)/lib -+ $(BSD_INSTALL_LIB) libxenguest.a $(PREFIX)/lib -+ ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxenguest.so.$(MAJOR) -+ ln -sf libxenguest.so.$(MAJOR) $(PREFIX)/lib/libxenguest.so -+ $(BSD_INSTALL_DATA) xenguest.h $(PREFIX)/include - - .PHONY: TAGS - TAGS: diff --git a/sysutils/xentools30/patches/patch-au b/sysutils/xentools30/patches/patch-au deleted file mode 100644 index 7af66c73165..00000000000 --- a/sysutils/xentools30/patches/patch-au +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-au,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- libxc/xc_private.h.orig 2006-10-16 22:15:35.000000000 +0200 -+++ libxc/xc_private.h 2006-10-16 22:16:09.000000000 +0200 -@@ -15,7 +15,11 @@ - - #include "xenctrl.h" - -+#ifdef __NetBSD__ -+#include <xen/NetBSD/xenio.h> -+#else - #include <xen/sys/privcmd.h> -+#endif - - /* valgrind cannot see when a hypercall has filled in some values. For this - reason, we must zero the privcmd_hypercall_t or domctl/sysctl instance diff --git a/sysutils/xentools30/patches/patch-av b/sysutils/xentools30/patches/patch-av deleted file mode 100644 index 531ff233701..00000000000 --- a/sysutils/xentools30/patches/patch-av +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-av,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- libxc/xg_private.h.orig 2006-10-16 22:15:35.000000000 +0200 -+++ libxc/xg_private.h 2006-10-16 22:16:19.000000000 +0200 -@@ -15,7 +15,6 @@ - #include "xenguest.h" - #include "xc_private.h" - --#include <xen/sys/privcmd.h> - #include <xen/memory.h> - #include <xen/elfnote.h> - diff --git a/sysutils/xentools30/patches/patch-aw b/sysutils/xentools30/patches/patch-aw deleted file mode 100644 index e706636667f..00000000000 --- a/sysutils/xentools30/patches/patch-aw +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-aw,v 1.3 2007/04/28 17:14:52 bouyer Exp $ - ---- misc/Makefile.orig 2007-01-08 16:00:49.000000000 +0100 -+++ misc/Makefile 2007-04-25 18:37:08.000000000 +0200 -@@ -11,8 +11,10 @@ - - TARGETS = xenperf xc_shadow - --INSTALL_BIN = $(TARGETS) xencons --INSTALL_SBIN = netfix xm xen-bugtool xend xenperf -+INSTALL_BIN = $(TARGETS) -+INSTALL_BIN_SCRIPT = xencons -+INSTALL_SBIN = xenperf -+INSTALL_SBIN_SCRIPT = netfix xm xen-bugtool xend - - .PHONY: all - all: build -@@ -24,11 +26,13 @@ - - .PHONY: install - install: build -- [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin -- [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin -- $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin -- $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin -- $(MAKE) -C lomount install -+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin -+ $(BSD_INSTALL_PROGRAM) $(INSTALL_BIN) $(PREFIX)/bin -+ $(BSD_INSTALL_SCRIPT) $(INSTALL_BIN_SCRIPT) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) $(INSTALL_SBIN) $(PREFIX)/sbin -+ $(BSD_INSTALL_SCRIPT) $(INSTALL_SBIN_SCRIPT) $(PREFIX)/sbin -+# $(MAKE) -C lomount install - # No sense in installing miniterm on the Xen box. - # $(MAKE) -C miniterm install - -@@ -42,4 +46,4 @@ - $(CC) -c $(CFLAGS) -o $@ $< - - $(TARGETS): %: %.o Makefile -- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl -+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl diff --git a/sysutils/xentools30/patches/patch-ax b/sysutils/xentools30/patches/patch-ax deleted file mode 100644 index 646d71533b2..00000000000 --- a/sysutils/xentools30/patches/patch-ax +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- misc/xend.orig 2006-10-17 15:33:55.000000000 +0200 -+++ misc/xend 2006-10-17 15:38:47.000000000 +0200 -@@ -94,8 +94,7 @@ - os.execvp('xenconsoled', ['xenconsoled']) - - def start_blktapctrl(): -- if os.fork() == 0: -- os.execvp('blktapctrl', ['blktapctrl']) -+ '' - - def main(): - try: diff --git a/sysutils/xentools30/patches/patch-ba b/sysutils/xentools30/patches/patch-ba deleted file mode 100644 index f13bc49ac20..00000000000 --- a/sysutils/xentools30/patches/patch-ba +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2007/04/28 17:14:52 bouyer Exp $ - ---- python/Makefile.orig 2007-01-08 16:00:49.000000000 +0100 -+++ python/Makefile 2007-04-25 18:39:08.000000000 +0200 -@@ -11,10 +11,10 @@ - .PHONY: install - ifndef XEN_PYTHON_NATIVE_INSTALL - install: all -- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force -+ python setup.py install - else - install: all -- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force -+ python setup.py install - endif - - .PHONY: test diff --git a/sysutils/xentools30/patches/patch-bb b/sysutils/xentools30/patches/patch-bb deleted file mode 100644 index f9229551ce4..00000000000 --- a/sysutils/xentools30/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.3 2007/04/28 17:14:52 bouyer Exp $ - ---- python/xen/xend/XendRoot.py.orig 2007-04-25 22:26:04.000000000 +0200 -+++ python/xen/xend/XendRoot.py 2007-04-25 22:26:18.000000000 +0200 -@@ -37,7 +37,7 @@ - """Root of the management classes.""" - - """Default path to the config file.""" -- config_default = "/etc/xen/xend-config.sxp" -+ config_default = "@XENDCONFDIR@/xend-config.sxp" - - """Environment variable used to override config_default.""" - config_var = "XEND_CONFIG" diff --git a/sysutils/xentools30/patches/patch-bc b/sysutils/xentools30/patches/patch-bc deleted file mode 100644 index b5c5379a202..00000000000 --- a/sysutils/xentools30/patches/patch-bc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2007/04/28 17:14:52 bouyer Exp $ - ---- python/xen/xm/create.py.orig 2007-04-25 22:19:55.000000000 +0200 -+++ python/xen/xm/create.py 2007-04-25 22:20:12.000000000 +0200 -@@ -64,7 +64,7 @@ - use="Quiet.") - - gopts.opt('path', val='PATH', -- fn=set_value, default='.:/etc/xen', -+ fn=set_value, default='.:@XENDCONFDIR@', - use="Search path for configuration scripts. " - "The value of PATH is a colon-separated directory list.") - -@@ -318,7 +318,7 @@ - preferred instance number. The hotplug script will determine - which instance number will actually be assigned to the domain. - The associtation between virtual machine and the TPM instance -- number can be found in /etc/xen/vtpm.db. Use the backend in the -+ number can be found in @XENDCONFDIR@/vtpm.db. Use the backend in the - given domain. - The type parameter can be used to select a specific driver type - that the VM can use. To prevent a fully virtualized domain (HVM) diff --git a/sysutils/xentools30/patches/patch-be b/sysutils/xentools30/patches/patch-be deleted file mode 100644 index c7d1dd80427..00000000000 --- a/sysutils/xentools30/patches/patch-be +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-be,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- python/xen/lowlevel/acm/acm.c.orig 2006-10-17 00:18:15.000000000 +0200 -+++ python/xen/lowlevel/acm/acm.c 2006-10-17 00:18:25.000000000 +0200 -@@ -26,10 +26,10 @@ - #include <stdlib.h> - #include <sys/ioctl.h> - #include <netinet/in.h> -+#include <xenctrl.h> - #include <xen/acm.h> - #include <xen/acm_ops.h> - --#include <xenctrl.h> - - #define PERROR(_m, _a...) \ - fprintf(stderr, "ERROR: " _m " (%d = %s)\n" , ## _a , \ diff --git a/sysutils/xentools30/patches/patch-bf b/sysutils/xentools30/patches/patch-bf deleted file mode 100644 index 11fbe2a205b..00000000000 --- a/sysutils/xentools30/patches/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bf,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- python/xen/xm/addlabel.py.orig 2006-10-15 14:22:03.000000000 +0200 -+++ python/xen/xm/addlabel.py 2006-10-19 21:51:26.000000000 +0200 -@@ -133,7 +133,7 @@ - if argv[2].lower() == "dom": - configfile = argv[3] - if configfile[0] != '/': -- for prefix in [".", "/etc/xen"]: -+ for prefix in [".", "@XENDCONFDIR@"]: - configfile = prefix + "/" + configfile - if os.path.isfile(configfile): - break diff --git a/sysutils/xentools30/patches/patch-bg b/sysutils/xentools30/patches/patch-bg deleted file mode 100644 index 535c9af2c16..00000000000 --- a/sysutils/xentools30/patches/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bg,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- python/xen/xm/getlabel.py.orig 2006-10-15 14:22:03.000000000 +0200 -+++ python/xen/xm/getlabel.py 2006-10-19 21:52:18.000000000 +0200 -@@ -55,7 +55,7 @@ - if configfile[0] == '/': - fd = open(configfile, "rb") - else: -- for prefix in [".", "/etc/xen"]: -+ for prefix in [".", "@XENDCONFDIR@"]: - abs_file = prefix + "/" + configfile - if os.path.isfile(abs_file): - fd = open(abs_file, "rb") diff --git a/sysutils/xentools30/patches/patch-bh b/sysutils/xentools30/patches/patch-bh deleted file mode 100644 index 9918d9192d3..00000000000 --- a/sysutils/xentools30/patches/patch-bh +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bh,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- python/xen/xm/rmlabel.py.orig 2006-10-15 14:22:03.000000000 +0200 -+++ python/xen/xm/rmlabel.py 2006-10-19 21:52:58.000000000 +0200 -@@ -60,7 +60,7 @@ - file = configfile - fd = open(file, "rb") - else: -- for prefix in [".", "/etc/xen"]: -+ for prefix in [".", "@XENDCONFDIR@"]: - file = prefix + "/" + configfile - if os.path.isfile(file): - fd = open(file, "rb") diff --git a/sysutils/xentools30/patches/patch-bm b/sysutils/xentools30/patches/patch-bm deleted file mode 100644 index 58a951c1da4..00000000000 --- a/sysutils/xentools30/patches/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-bm,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- vnet/libxutil/Makefile.orig 2006-10-16 22:30:53.000000000 +0200 -+++ vnet/libxutil/Makefile 2006-10-16 22:31:48.000000000 +0200 -@@ -76,11 +76,10 @@ - - .PHONY: install - install: build -- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR) -- $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR) -- $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR) -- ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR) -- ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so -+ $(BSD_INSTALL_LIB) libxutil.so.$(MAJOR).$(MINOR) $(PREFIX)/lib -+ $(BSD_INSTALL_LIB) libxutil.a $(PREFIX)/lib -+ ln -sf libxutil.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxutil.so.$(MAJOR) -+ ln -sf libxutil.so.$(MAJOR) $(PREFIX)/lib/libxutil.so - - .PHONY: clean - clean: diff --git a/sysutils/xentools30/patches/patch-bo b/sysutils/xentools30/patches/patch-bo deleted file mode 100644 index 8db5f298cae..00000000000 --- a/sysutils/xentools30/patches/patch-bo +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-bo,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- xcutils/Makefile.orig 2006-10-16 22:32:32.000000000 +0200 -+++ xcutils/Makefile 2006-10-16 22:33:41.000000000 +0200 -@@ -28,7 +28,7 @@ - - PROGRAMS = xc_restore xc_save readnotes - --LDLIBS = -L$(XEN_LIBXC) -lxenguest -lxenctrl -+LDLIBS = $(LDFLAGS) -L$(XEN_LIBXC) -lxenguest -lxenctrl - - .PHONY: all - all: build -@@ -41,9 +41,8 @@ - - .PHONY: install - install: build -- [ -d $(DESTDIR)$(PROGRAMS_INSTALL_DIR) ] || \ -- $(INSTALL_DIR) $(DESTDIR)$(PROGRAMS_INSTALL_DIR) -- $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PROGRAMS_INSTALL_DIR) -+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) $(PROGRAMS) $(PREFIX)/bin - - - .PHONY: clean diff --git a/sysutils/xentools30/patches/patch-br b/sysutils/xentools30/patches/patch-br deleted file mode 100644 index 81ded9bf84e..00000000000 --- a/sysutils/xentools30/patches/patch-br +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-br,v 1.4 2007/04/28 17:14:52 bouyer Exp $ - ---- xenstat/xentop/Makefile.orig 2007-01-08 16:00:52.000000000 +0100 -+++ xenstat/xentop/Makefile 2007-04-25 18:43:18.000000000 +0200 -@@ -33,9 +33,8 @@ - - .PHONY: install - install: xentop xentop.1 -- $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop -- $(INSTALL_DIR) $(DESTDIR)$(man1dir) -- $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1 -+ $(BSD_INSTALL_PROGRAM) xentop $(PREFIX)/sbin -+ $(BSD_INSTALL_DATA) xentop.1 $(PREFIX)/$(PKGMANDIR)/man1 - - endif - diff --git a/sysutils/xentools30/patches/patch-bs b/sysutils/xentools30/patches/patch-bs deleted file mode 100644 index 288fc89bed9..00000000000 --- a/sysutils/xentools30/patches/patch-bs +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-bs,v 1.3 2007/04/28 17:14:52 bouyer Exp $ - ---- xenstore/Makefile.orig 2007-01-08 16:00:52.000000000 +0100 -+++ xenstore/Makefile 2007-04-25 18:45:31.000000000 +0200 -@@ -29,6 +29,7 @@ - - XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_linux.o - XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o -+XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_netbsd.o - - XENSTORED_OBJS += $(XENSTORED_OBJS_y) - -@@ -168,22 +169,20 @@ - - .PHONY: install - install: all -- $(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored -- $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored -- $(INSTALL_DIR) -p $(DESTDIR)/usr/bin -- $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin -- $(INSTALL_DIR) -p $(DESTDIR)/usr/include -- $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin -- $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin -- $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin -- $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin -- $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR) -- $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR) -- ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR) -- ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so -- $(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR) -- $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include -- $(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include -+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin -+ $(BSD_INSTALL_DATA_DIR) -p $(PREFIX)/include -+ $(BSD_INSTALL_PROGRAM) xenstored $(PREFIX)/sbin -+ $(BSD_INSTALL_PROGRAM) $(CLIENTS) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) xenstore-control $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) xenstore-ls $(PREFIX)/bin -+ $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib -+ $(BSD_INSTALL_LIB) libxenstore.so.$(MAJOR).$(MINOR) $(PREFIX)/lib -+ ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxenstore.so.$(MAJOR) -+ ln -sf libxenstore.so.$(MAJOR) $(PREFIX)/lib/libxenstore.so -+ $(BSD_INSTALL_LIB) libxenstore.a $(PREFIX)/lib -+ $(BSD_INSTALL_DATA) xs.h $(PREFIX)/include -+ $(BSD_INSTALL_DATA) xs_lib.h $(PREFIX)/include - - -include $(PROG_DEP) - diff --git a/sysutils/xentools30/patches/patch-bt b/sysutils/xentools30/patches/patch-bt deleted file mode 100644 index ed844a383ae..00000000000 --- a/sysutils/xentools30/patches/patch-bt +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-bt,v 1.3 2007/04/28 17:14:52 bouyer Exp $ - ---- /dev/null 2007-04-25 19:26:24.000000000 +0200 -+++ xenstore/xenstored_netbsd.c 2007-04-25 19:28:19.000000000 +0200 -@@ -0,0 +1,73 @@ -+/****************************************************************************** -+ * -+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ * -+ * Copyright (C) 2005 Rusty Russell IBM Corporation -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#include <fcntl.h> -+#include <unistd.h> -+#include <stdlib.h> -+#include <sys/mman.h> -+ -+#include "xenstored_core.h" -+ -+#define XENSTORED_PROC_KVA "/dev/xsd_kva" -+#define XENSTORED_PROC_PORT "/kern/xen/xsd_port" -+ -+evtchn_port_t xenbus_evtchn(void) -+{ -+ int fd; -+ int rc; -+ evtchn_port_t port; -+ char str[20]; -+ -+ fd = open(XENSTORED_PROC_PORT, O_RDONLY); -+ if (fd == -1) -+ return -1; -+ -+ rc = read(fd, str, sizeof(str)); -+ if (rc == -1) -+ { -+ int err = errno; -+ close(fd); -+ errno = err; -+ return -1; -+ } -+ -+ str[rc] = '\0'; -+ port = strtoul(str, NULL, 0); -+ -+ close(fd); -+ return port; -+} -+ -+void *xenbus_map(void) -+{ -+ int fd; -+ void *addr; -+ -+ fd = open(XENSTORED_PROC_KVA, O_RDWR); -+ if (fd == -1) -+ return NULL; -+ -+ addr = mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE, -+ MAP_SHARED, fd, 0); -+ -+ if (addr == MAP_FAILED) -+ addr = NULL; -+ -+ close(fd); -+ -+ return addr; -+} -+ -+void xenbus_notify_running(void) -+{ -+} diff --git a/sysutils/xentools30/patches/patch-bw b/sysutils/xentools30/patches/patch-bw deleted file mode 100644 index 3881c749e77..00000000000 --- a/sysutils/xentools30/patches/patch-bw +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bw,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- xenstore/list.h.orig 2006-10-16 22:51:42.000000000 +0200 -+++ xenstore/list.h 2006-10-16 22:51:57.000000000 +0200 -@@ -3,6 +3,10 @@ - /* Taken from Linux kernel code, but de-kernelized for userspace. */ - #include <stddef.h> - -+#undef LIST_HEAD_INIT -+#undef LIST_HEAD -+#undef INIT_LIST_HEAD -+ - /* - * These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses diff --git a/sysutils/xentools30/patches/patch-cb b/sysutils/xentools30/patches/patch-cb deleted file mode 100644 index 53dc2090fc6..00000000000 --- a/sysutils/xentools30/patches/patch-cb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cb,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- console/daemon/utils.c.orig 2006-10-16 22:55:37.000000000 +0200 -+++ console/daemon/utils.c 2006-10-16 22:55:48.000000000 +0200 -@@ -32,6 +32,7 @@ - #include <sys/socket.h> - #include <sys/un.h> - #include <string.h> -+#include <signal.h> - - #include "xenctrl.h" - #include "utils.h" diff --git a/sysutils/xentools30/patches/patch-cc b/sysutils/xentools30/patches/patch-cc deleted file mode 100644 index 8d8991d9f6a..00000000000 --- a/sysutils/xentools30/patches/patch-cc +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-cc,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- console/client/main.c.orig 2006-10-16 22:56:01.000000000 +0200 -+++ console/client/main.c 2006-10-16 22:57:28.000000000 +0200 -@@ -34,7 +34,11 @@ - #include <sys/select.h> - #include <err.h> - #include <errno.h> -+#ifndef __NetBSD__ - #include <pty.h> -+#endif -+#include <string.h> -+ - - #include "xs.h" - -@@ -253,6 +257,7 @@ - free(str_pty); - free(path); - -+ init_term(spty, &attr); - init_term(STDIN_FILENO, &attr); - console_loop(spty); - restore_term(STDIN_FILENO, &attr); diff --git a/sysutils/xentools30/patches/patch-cd b/sysutils/xentools30/patches/patch-cd deleted file mode 100644 index 147205b2d97..00000000000 --- a/sysutils/xentools30/patches/patch-cd +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cd,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- python/xen/util/auxbin.py.orig 2006-10-16 22:57:51.000000000 +0200 -+++ python/xen/util/auxbin.py 2006-10-16 22:58:05.000000000 +0200 -@@ -16,8 +16,8 @@ - #============================================================================ - - --LIB_32 = "/usr/lib" --LIB_64 = "/usr/lib64" --LIB_BIN_SUFFIX = "xen/bin" -+LIB_32 = "@PREFIX@/bin" -+LIB_64 = "@PREFIX@/bin" -+LIB_BIN_SUFFIX = "" - - ## The architectures on which the LIB_64 directory is used. This diff --git a/sysutils/xentools30/patches/patch-cf b/sysutils/xentools30/patches/patch-cf deleted file mode 100644 index e9194358b29..00000000000 --- a/sysutils/xentools30/patches/patch-cf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cf,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- xenstat/libxenstat/Makefile.orig 2006-10-16 22:59:05.000000000 +0200 -+++ xenstat/libxenstat/Makefile 2006-10-16 22:59:16.000000000 +0200 -@@ -88,7 +88,7 @@ - all-bindings: perl-bindings python-bindings - - # The install-bindings target installs all the language bindings --install-bindings: install-perl-bindings install-python-bindings -+install-bindings: install-python-bindings - - $(BINDINGS): $(SHLIB) $(SHLIB_LINKS) src/xenstat.h - diff --git a/sysutils/xentools30/patches/patch-cg b/sysutils/xentools30/patches/patch-cg deleted file mode 100644 index 073e5fae635..00000000000 --- a/sysutils/xentools30/patches/patch-cg +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-cg,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- xenstat/xentop/xentop.c.orig 2006-10-04 04:28:30.000000000 +0200 -+++ xenstat/xentop/xentop.c 2006-10-17 00:16:10.000000000 +0200 -@@ -18,7 +18,8 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ --#include <curses.h> -+#include <ncurses.h> -+#define vw_printw vwprintw - #include <ctype.h> - #include <errno.h> - #include <stdio.h> -@@ -27,7 +28,11 @@ - #include <sys/time.h> - #include <time.h> - #include <unistd.h> -+#ifndef __NetBSD__ - #include <linux/kdev_t.h> -+#else -+#include <stdarg.h> -+#endif - - #include <xenstat.h> - -@@ -895,6 +900,7 @@ - /* Output all VBD information */ - void do_vbd(xenstat_domain *domain) - { -+#ifdef notyet - int i = 0; - xenstat_vbd *vbd; - unsigned num_vbds = 0; -@@ -911,6 +917,7 @@ - xenstat_vbd_rd_reqs(vbd), - xenstat_vbd_wr_reqs(vbd)); - } -+#endif - } - - static void top(void) diff --git a/sysutils/xentools30/patches/patch-ch b/sysutils/xentools30/patches/patch-ch deleted file mode 100644 index e7fb58617c6..00000000000 --- a/sysutils/xentools30/patches/patch-ch +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-ch,v 1.2 2006/10/19 22:57:13 bouyer Exp $ - ---- xenstat/libxenstat/src/xenstat.c.orig 2006-10-04 04:28:30.000000000 +0200 -+++ xenstat/libxenstat/src/xenstat.c 2006-10-18 15:43:34.000000000 +0200 -@@ -596,6 +596,8 @@ - /* Collect information about networks */ - static int xenstat_collect_networks(xenstat_node * node) - { -+#ifndef __NetBSD__ -+ /* XXX fixme: implement code to get stats from libkvm ! */ - /* Open and validate /proc/net/dev if we haven't already */ - if (node->handle->procnetdev == NULL) { - char header[sizeof(PROCNETDEV_HEADER)]; -@@ -675,6 +677,9 @@ - } - - return 1; -+#else -+ return 1; -+#endif - } - - /* Free network information */ -@@ -786,6 +791,7 @@ - { - } - -+#ifndef __NetBSD__ - /* - * VBD functions - */ -@@ -804,10 +810,12 @@ - ret[num_read] = '\0'; - return num_read; - } -+#endif - - /* Collect information about VBDs */ - static int xenstat_collect_vbds(xenstat_node * node) - { -+#ifndef __NetBSD__ - struct dirent *dp; - - if (node->handle->sysfsvbd == NULL) { -@@ -877,6 +885,7 @@ - domain->vbds[domain->num_vbds - 1] = vbd; - } - -+#endif - return 1; - } - diff --git a/sysutils/xentools30/patches/patch-ci b/sysutils/xentools30/patches/patch-ci deleted file mode 100644 index 3e6f252457a..00000000000 --- a/sysutils/xentools30/patches/patch-ci +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2007/04/28 17:14:53 bouyer Exp $ - ---- ../xen/include/public/arch-x86/xen.h.orig 2007-04-25 19:25:41.000000000 +0200 -+++ ../xen/include/public/arch-x86/xen.h 2007-04-25 19:25:43.000000000 +0200 -@@ -35,9 +35,10 @@ - #define __DEFINE_XEN_GUEST_HANDLE(name, type) \ - typedef type * __guest_handle_ ## name - #endif -+#define __XEN_GUEST_HANDLE(name) __guest_handle_ ## name - - #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) --#define XEN_GUEST_HANDLE(name) __guest_handle_ ## name -+#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name) - #define set_xen_guest_handle(hnd, val) do { (hnd).p = val; } while (0) - #ifdef __XEN_TOOLS__ - #define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0) diff --git a/sysutils/xentools30/patches/patch-cj b/sysutils/xentools30/patches/patch-cj deleted file mode 100644 index fa5a99322a3..00000000000 --- a/sysutils/xentools30/patches/patch-cj +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-cj,v 1.1 2007/04/28 17:14:53 bouyer Exp $ - ---- python/xen/xend/osdep.py.orig 2007-04-25 22:22:18.000000000 +0200 -+++ python/xen/xend/osdep.py 2007-04-25 22:23:03.000000000 +0200 -@@ -22,9 +22,11 @@ - _scripts_dir = { - "Linux": "/etc/xen/scripts", - "SunOS": "/usr/lib/xen/scripts", -+ "NetBSD": "@XENDCONFDIR@/scripts", - } - - _xend_autorestart = { -+ "NetBSD": True, - "Linux": True, - "SunOS": False, - } -@@ -32,5 +34,5 @@ - def _get(var, default=None): - return var.get(os.uname()[0], default) - --scripts_dir = _get(_scripts_dir, "/etc/xen/scripts") -+scripts_dir = _get(_scripts_dir, "@XENDCONFDIR@/scripts") - xend_autorestart = _get(_xend_autorestart) diff --git a/sysutils/xentools30/patches/patch-ck b/sysutils/xentools30/patches/patch-ck deleted file mode 100644 index 68105974938..00000000000 --- a/sysutils/xentools30/patches/patch-ck +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ck,v 1.1 2007/04/28 17:14:53 bouyer Exp $ - ---- xenstore/xs_lib.c.orig 2007-01-08 16:00:53.000000000 +0100 -+++ xenstore/xs_lib.c 2007-04-26 13:16:40.000000000 +0200 -@@ -79,8 +79,10 @@ - if (s) - return s; - --#ifdef __linux__ -+#if defined(__linux__) - return "/proc/xen/xenbus"; -+#elif defined(__NetBSD__) -+ return "/kern/xen/xenbus"; - #else - return "/dev/xen/xenbus"; - #endif diff --git a/sysutils/xentools30/patches/patch-cl b/sysutils/xentools30/patches/patch-cl deleted file mode 100644 index 9dc8ea04ddf..00000000000 --- a/sysutils/xentools30/patches/patch-cl +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cl,v 1.1 2007/04/28 17:14:53 bouyer Exp $ - ---- python/xen/xend/server/XMLRPCServer.py.orig 2007-04-26 19:26:44.000000000 +0200 -+++ python/xen/xend/server/XMLRPCServer.py 2007-04-26 19:26:52.000000000 +0200 -@@ -177,6 +177,7 @@ - # ----------------------------------------------------------------- - try: - self.server.socket.settimeout(1.0) -+ self.server.socket.setblocking(True); - while self.running: - self.server.handle_request() - finally: diff --git a/sysutils/xentools30/patches/patch-cm b/sysutils/xentools30/patches/patch-cm deleted file mode 100644 index ac9acb7a818..00000000000 --- a/sysutils/xentools30/patches/patch-cm +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-cm,v 1.1 2007/04/28 17:41:31 bouyer Exp $ - ---- ../docs/man/xend-config.sxp.pod.5.orig 2007-01-08 16:00:44.000000000 +0100 -+++ ../docs/man/xend-config.sxp.pod.5 2007-04-28 19:21:52.000000000 +0200 -@@ -4,7 +4,7 @@ - - =head1 SYNOPSIS - --/etc/xen/xend-config.sxp -+@XENDCONFDIR@/xend-config.sxp - - =head1 DESCRIPTION - -@@ -12,7 +12,7 @@ - parameters which determine the behavior of the daemon at runtime. - - The parameters are specified in S-expression format. See the example --configuration file in I</etc/xen/xend-config.sxp> for details. -+configuration file in I<@XENDCONFDIR@/xend-config.sxp> for details. - - =head1 OPTIONS - -@@ -82,13 +82,13 @@ - - =item I<network-script> - --The name of the script in I</etc/xen/scripts> that will be run to -+The name of the script in I<@XENDCONFDIR@/scripts> that will be run to - setup the networking environment. This can be any name, but in - general is either I<network-bridge> or I<network-route>. - - =item I<vif-script> - --The name of the script in I</etc/xen/scripts> that will be run to -+The name of the script in I<@XENDCONFDIR@/scripts> that will be run to - setup a virtual interface when it is created or destroyed. This needs - to (in general) work in unison with the I<network-script>. - -@@ -113,7 +113,7 @@ - - The name of an application or script that can handle external device - migration, such as for example virtual TPM migration. An example --script is I</etc/xen/scripts/external-device-migrate>. -+script is I<@XENDCONFDIR@/scripts/external-device-migrate>. - - =back - diff --git a/sysutils/xentools30/patches/patch-cn b/sysutils/xentools30/patches/patch-cn deleted file mode 100644 index 312e42300b6..00000000000 --- a/sysutils/xentools30/patches/patch-cn +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-cn,v 1.1 2007/04/28 17:41:31 bouyer Exp $ - ---- ../docs/man/xmdomain.cfg.pod.5.orig 2007-01-08 16:00:44.000000000 +0100 -+++ ../docs/man/xmdomain.cfg.pod.5 2007-04-28 19:21:52.000000000 +0200 -@@ -4,9 +4,9 @@ - - =head1 SYNOPSIS - -- /etc/xen/myxendomain -- /etc/xen/myxendomain2 -- /etc/xen/auto/myxenautostarted -+ @XENDCONFDIR@/myxendomain -+ @XENDCONFDIR@/myxendomain2 -+ @XENDCONFDIR@/auto/myxenautostarted - - =head1 DESCRIPTION - -@@ -14,14 +14,14 @@ - domains to create from scratch. Each of these config files needs to - contain a number of required options, and may specify many more. - --Domain configuration files live in /etc/xen by default, if you store -+Domain configuration files live in @XENDCONFDIR@ by default, if you store - config files anywhere else the full path to the config file must be - specified in the I<xm create> command. - --/etc/xen/auto is a special case. Domain config files in that -+@XENDCONFDIR@/auto is a special case. Domain config files in that - directory will be started automatically at system boot if the --xendomain init script is enabled. The contents of /etc/xen/auto --should be symlinks to files in /etc/xen to allow I<xm create> to be -+xendomain init script is enabled. The contents of @XENDCONFDIR@/auto -+should be symlinks to files in @XENDCONFDIR@ to allow I<xm create> to be - used without full paths. - - Options are specified by I<name = value> statements in the diff --git a/sysutils/xentools30/patches/patch-co b/sysutils/xentools30/patches/patch-co deleted file mode 100644 index a7505701955..00000000000 --- a/sysutils/xentools30/patches/patch-co +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-co,v 1.1 2007/04/28 17:41:31 bouyer Exp $ - ---- ../docs/man/xm.pod.1.orig 2007-01-08 16:00:44.000000000 +0100 -+++ ../docs/man/xm.pod.1 2007-04-28 19:21:52.000000000 +0200 -@@ -72,7 +72,7 @@ - Name=Value combinations. - - Configfile can either be an absolute path to a file, or a relative --path to a file located in /etc/xen. -+path to a file located in @XENDCONFDIR@. - - Create will return B<as soon> as the domain is started. This B<does - not> mean the guest OS in the domain has actually booted, or is -@@ -97,7 +97,7 @@ - - xm create Fedora4 - --This creates a domain with the file /etc/xen/Fedora4, and returns as -+This creates a domain with the file @XENDCONFDIR@/Fedora4, and returns as - soon as it is run. - - =item I<without config file> -@@ -798,7 +798,7 @@ - name pre-fix for the policy xml file. The preceding name parts are - translated into the local path pointing to the policy xml file - relative to the global policy root directory --(/etc/xen/acm-security/policies). For example, -+(@XENDCONFDIR@/acm-security/policies). For example, - example.chwall_ste.client_v1 denotes the policy file - example/chwall_ste/client_v1-security_policy.xml relative to the - global policy root directory. -@@ -889,7 +889,7 @@ - =over 4 - - This step creates client_v1.map and client_v1.bin files in --/etc/xen/acm-security/policies/example/chwall_ste. -+@XENDCONFDIR@/acm-security/policies/example/chwall_ste. - - xm makepolicy example.chwall_ste.client_v1 - |