diff options
Diffstat (limited to 'sysutils/xentools41')
76 files changed, 0 insertions, 3685 deletions
diff --git a/sysutils/xentools41/DESCR b/sysutils/xentools41/DESCR deleted file mode 100644 index 04e509483fc..00000000000 --- a/sysutils/xentools41/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -The Xen virtual machine monitor allows running several virtual machines -on a single physical machine. The xentools41 package contains the -tools to create, destroy and control the virtual machines. - -This package contains the tools for Xen 4.1.x diff --git a/sysutils/xentools41/MESSAGE.NetBSD b/sysutils/xentools41/MESSAGE.NetBSD deleted file mode 100644 index 28dae84aab1..00000000000 --- a/sysutils/xentools41/MESSAGE.NetBSD +++ /dev/null @@ -1,17 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2011/04/06 09:10:26 cegger 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/xentools41/Makefile b/sysutils/xentools41/Makefile deleted file mode 100644 index 14adae51595..00000000000 --- a/sysutils/xentools41/Makefile +++ /dev/null @@ -1,204 +0,0 @@ -# $NetBSD: Makefile,v 1.65 2016/12/20 10:22:29 bouyer Exp $ -# -# VERSION is set in version.mk as it is shared with other packages -.include "version.mk" - -DISTNAME= xen-${VERSION} -PKGNAME= xentools41-${VERSION} -PKGREVISION= 18 -CATEGORIES= sysutils -MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ - -DISTFILES= ${DISTNAME}.tar.gz -DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz -SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://xen.org/ -COMMENT= Userland Tools for Xen 4.1.x - -LICENSE= gnu-gpl-v2 - -#DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline -DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses - -# XXX add version check: Xen requires dev86 >= 0.16.14 -BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware -.if !exists(/usr/bin/iasl) -BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils -.endif - -PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-xml - -PKG_SYSCONFSUBDIR= xen - -ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 -ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 - -CONFLICTS+= libxen-[0-9]* -CONFLICTS+= xentools20-[0-9]* -CONFLICTS+= xentools3* -CONFLICTS+= xenstoretools-* - -WRKSRC= ${WRKDIR}/xen-${VERSION}/tools -CHECK_PORTABILITY_SKIP= examples/* - -EGDIR= ${PREFIX}/share/examples/xen -MESSAGE_SUBST= EGDIR=${EGDIR} - -USE_TOOLS+= perl #for pod2man -USE_TOOLS+= gmake pkg-config - -MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} -MAKE_ENV+= EGDIR=${EGDIR:Q} -MAKE_ENV+= BASH_COMPLETION_DIR=${EGDIR:Q} -MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} -MAKE_ENV+= VARBASE=${VARBASE} -MAKE_ENV+= XEN_CONFIG_DIR=${PKG_SYSCONFDIR} -MAKE_ENV+= V=YES - -#MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} -#MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} -#MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} - -PY_PATCHPLIST= yes -#REPLACE_PYTHON+= misc/xm -#REPLACE_PYTHON+= misc/netfix -#REPLACE_PYTHON+= misc/xen-bugtool -#REPLACE_PYTHON+= misc/xencons -#REPLACE_PYTHON+= misc/xend -#REPLACE_PYTHON+= misc/xensymoops -#REPLACE_PYTHON+= misc/xen-python-path -#REPLACE_PYTHON+= pygrub/src/pygrub -#REPLACE_PYTHON+= python/xen/util/*.py -#REPLACE_PYTHON+= python/xen/xend/*.py -#REPLACE_PYTHON+= python/xen/xm/*.py -#REPLACE_PYTHON+= python/xen/util/*.py -#REPLACE_PYTHON+= python/*.py -#REPLACE_PYTHON+= security/python/xensec_gen/cgi-bin/policy.cgi -#REPLACE_PYTHON+= security/python/xensec_gen/*.py -#REPLACE_PYTHON+= security/python/*.py -#REPLACE_PYTHON+= security/*.py -#REPLACE_PYTHON+= xenmon/*.py -#REPLACE_PYTHON+= xentrace/xentrace_format - -REPLACE_PYTHON+= python/xen/remus/*.py -REPLACE_PYTHON+= python/xen/util/*.py -REPLACE_PYTHON+= python/xen/xend/*.py -REPLACE_PYTHON+= python/xen/xm/*.py -REPLACE_PYTHON+= xenmon/xenmon.py - -SUBST_CLASSES+= pathsvar -SUBST_STAGE.pathsvar= pre-configure -SUBST_FILES.pathsvar= Makefile \ - examples/xend-config.sxp \ - hotplug/Linux/init.d/sysconfig.xendomains \ - python/xen/xend/XendOptions.py \ - python/xen/xend/server/relocate.py \ - python/xen/xend/tests/xend-config.sxp \ - security/Makefile \ - security/python/xensec_gen/main.py \ - xenstore/xs_lib.c -SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" - -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_FILES.conf+= python/xen/xm/create.py -SUBST_FILES.conf+= ocaml/xenstored/define.ml -SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" - -XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh - -SUBST_CLASSES.NetBSD+= proc -SUBST_STAGE.proc= pre-configure -SUBST_FILES.proc= python/xen/xend/XendVnet.py -SUBST_FILES.proc+= ocaml/xenstored/define.ml -SUBST_SED.proc= -e "s|/proc|/kern|g" - -OPSYSVARS+= PROCPATH -PROCPATH.NetBSD= /kern -PROCPATH.*= /proc - -.include "../../mk/bsd.prefs.mk" - -SUBST_CLASSES+= procdev -SUBST_STAGE.procdev= pre-configure -SUBST_FILES.procdev= ocaml/xenstored/define.ml -.if ${OPSYS} == "NetBSD" -SUBST_SED.procdev= -e "s|@PROCDEV@|/dev|g" -.else -SUBST_SED.procdev= -e "s|@PROCDEV@|/proc/xen|g" -.endif - -RCD_SCRIPTS= xen-watchdog xencommons xend xendomains -FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q} -FILES_SUBST+= PROCPATH=${PROCPATH:Q} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} -FILES_SUBST+= PREFIX=${PREFIX:Q} - -BLKTAP_FILES= blk_netbsd.c blktapctrl_netbsd.c - -CONF_FILES+= ${EGDIR}/xend-config.sxp ${PKG_SYSCONFDIR}/xend-config.sxp -CONF_FILES+= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats -CONF_FILES+= ${EGDIR}/xm-config.xml ${PKG_SYSCONFDIR}/xm-config.xml - -OWN_DIRS= ${PKG_SYSCONFDIR}/scripts ${VARBASE}/log/xen ${VARBASE}/lib - -.for s in ${XEND_SCRIPTS} -CONF_FILES_PERMS+= ${EGDIR}/scripts/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ - ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 -.endfor - -pre-build: - rm -f ${WRKSRC}/check/check_x11_devel -.for s in ${BLKTAP_FILES} - ${CP} ${FILESDIR}/${s} ${WRKSRC}/blktap/drivers/ -.endfor - 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 - -INSTALLATION_DIRS= ${EGDIR} ${PKGMANDIR}/man5 - -post-install: - for f in xend-config.sxp xmexample1 xmexample2 xmexample3; do \ - ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f; \ - done - ${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 - ${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 - ${INSTALL_DATA} ${WRKDIR}/xm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - -.if (${OPSYS} == "NetBSD" && \ - (empty(OS_VERSION:M6.99.[3-9]?) && empty(OS_VERSION:M[7-9].*))) -CPPFLAGS+= -Dshm_open=open -Dshm_unlink=unlink -.endif - -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -EXTRA_HOSTCFLAGS+= -Wno-error=ignored-attributes -EXTRA_CFLAGS+= -Wno-error=ignored-attributes -no-integrated-as \ - -Wno-error=tautological-compare -Wno-error=null-dereference \ - -Wno-error=empty-body -Wno-error=self-assign \ - -Wno-error=sometimes-uninitialized -Wno-error=unused-function -BUILDLINK_TRANSFORM+= rm:-falign-jumps=1 rm:-falign-loops=1 \ - rm:-mpreferred-stack-boundary=2 -.endif - -MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:Q} - -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.include "../../textproc/py-xml/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" -#.include "../../devel/SDL/buildlink3.mk" -.include "../../lang/ocaml/buildlink3.mk" -.include "../../devel/ocaml-findlib/buildlink3.mk" -.include "../../sysutils/pciutils/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xentools41/PLIST b/sysutils/xentools41/PLIST deleted file mode 100644 index 9958acc4dec..00000000000 --- a/sysutils/xentools41/PLIST +++ /dev/null @@ -1,756 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:16 jperkin Exp $ -bin/lsevtchn -bin/pygrub -bin/qemu-img-xen -bin/readnotes -bin/remus -bin/xc_restore -bin/xc_save -bin/xen-detect -bin/xencons -bin/xenconsole -bin/xenctx -bin/xenstore -bin/xenstore-chmod -bin/xenstore-control -bin/xenstore-exists -bin/xenstore-list -bin/xenstore-ls -bin/xenstore-read -bin/xenstore-rm -bin/xenstore-watch -bin/xenstore-write -bin/xentrace -bin/xentrace_format -bin/xentrace_setsize -include/_libxl_types.h -include/blktaplib.h -include/fsimage.h -include/fsimage_grub.h -include/fsimage_plugin.h -include/libxl.h -include/libxl_uuid.h -include/xen/COPYING -include/xen/arch-ia64.h -include/xen/arch-ia64/debug_op.h -include/xen/arch-ia64/hvm/memmap.h -include/xen/arch-ia64/hvm/save.h -include/xen/arch-ia64/sioemu.h -include/xen/arch-x86/cpuid.h -include/xen/arch-x86/hvm/save.h -include/xen/arch-x86/xen-mca.h -include/xen/arch-x86/xen-x86_32.h -include/xen/arch-x86/xen-x86_64.h -include/xen/arch-x86/xen.h -include/xen/arch-x86_32.h -include/xen/arch-x86_64.h -include/xen/callback.h -include/xen/dom0_ops.h -include/xen/domctl.h -include/xen/elfnote.h -include/xen/event_channel.h -include/xen/features.h -include/xen/foreign/ia64.h -include/xen/foreign/x86_32.h -include/xen/foreign/x86_64.h -include/xen/grant_table.h -include/xen/hvm/e820.h -include/xen/hvm/hvm_info_table.h -include/xen/hvm/hvm_op.h -include/xen/hvm/ioreq.h -include/xen/hvm/params.h -include/xen/hvm/save.h -include/xen/io/blkif.h -include/xen/io/console.h -include/xen/io/fbif.h -include/xen/io/fsif.h -include/xen/io/kbdif.h -include/xen/io/netif.h -include/xen/io/pciif.h -include/xen/io/protocols.h -include/xen/io/ring.h -include/xen/io/tpmif.h -include/xen/io/usbif.h -include/xen/io/vscsiif.h -include/xen/io/xenbus.h -include/xen/io/xs_wire.h -include/xen/kexec.h -include/xen/mem_event.h -include/xen/memory.h -include/xen/nmi.h -include/xen/physdev.h -include/xen/platform.h -include/xen/sched.h -include/xen/sys/evtchn.h -include/xen/sys/gntdev.h -include/xen/sys/privcmd.h -include/xen/sysctl.h -include/xen/tmem.h -include/xen/trace.h -include/xen/vcpu.h -include/xen/version.h -include/xen/xen-compat.h -include/xen/xen.h -include/xen/xencomm.h -include/xen/xenoprof.h -include/xen/xsm/acm.h -include/xen/xsm/acm_ops.h -include/xen/xsm/flask_op.h -include/xen/xsm/libflask.h -include/xenctrl.h -include/xenctrlosdep.h -include/xenguest.h -include/xentoollog.h -include/xs.h -include/xs_lib.h -lib/fs/ext2fs/fsimage.so -lib/fs/fat/fsimage.so -lib/fs/iso9660/fsimage.so -lib/fs/reiserfs/fsimage.so -lib/fs/ufs/fsimage.so -lib/fs/zfs/fsimage.so -lib/libblktap.a -lib/libblktap.so -lib/libblktap.so.3.0 -lib/libblktap.so.3.0.0 -lib/libflask.a -lib/libflask.so -lib/libflask.so.1.0 -lib/libflask.so.1.0.0 -lib/libfsimage.so -lib/libfsimage.so.1.0 -lib/libfsimage.so.1.0.0 -lib/libxenctrl.a -lib/libxenctrl.so -lib/libxenctrl.so.4.0 -lib/libxenctrl.so.4.0.0 -lib/libxenguest.a -lib/libxenguest.so -lib/libxenguest.so.4.0 -lib/libxenguest.so.4.0.0 -lib/libxenlight.a -lib/libxenlight.so -lib/libxenlight.so.1.0 -lib/libxenlight.so.1.0.0 -lib/libxenstore.a -lib/libxenstore.so -lib/libxenstore.so.3.0 -lib/libxenstore.so.3.0.0 -lib/libxlutil.a -lib/libxlutil.so -lib/libxlutil.so.1.0 -lib/libxlutil.so.1.0.0 -lib/ocaml/site-lib/eventchn/META -lib/ocaml/site-lib/eventchn/dlleventchn_stubs.so -lib/ocaml/site-lib/eventchn/eventchn.a -lib/ocaml/site-lib/eventchn/eventchn.cma -lib/ocaml/site-lib/eventchn/eventchn.cmi -lib/ocaml/site-lib/eventchn/eventchn.cmx -lib/ocaml/site-lib/eventchn/eventchn.cmxa -lib/ocaml/site-lib/eventchn/libeventchn_stubs.a -lib/ocaml/site-lib/log/META -lib/ocaml/site-lib/log/dllsyslog_stubs.so -lib/ocaml/site-lib/log/libsyslog_stubs.a -lib/ocaml/site-lib/log/log.a -lib/ocaml/site-lib/log/log.cma -lib/ocaml/site-lib/log/log.cmi -lib/ocaml/site-lib/log/log.cmx -lib/ocaml/site-lib/log/log.cmxa -lib/ocaml/site-lib/log/logs.cmi -lib/ocaml/site-lib/log/logs.cmx -lib/ocaml/site-lib/log/syslog.cmi -lib/ocaml/site-lib/log/syslog.cmx -lib/ocaml/site-lib/mmap/META -lib/ocaml/site-lib/mmap/dllmmap_stubs.so -lib/ocaml/site-lib/mmap/libmmap_stubs.a -lib/ocaml/site-lib/mmap/mmap.a -lib/ocaml/site-lib/mmap/mmap.cma -lib/ocaml/site-lib/mmap/mmap.cmi -lib/ocaml/site-lib/mmap/mmap.cmx -lib/ocaml/site-lib/mmap/mmap.cmxa -lib/ocaml/site-lib/uuid/META -lib/ocaml/site-lib/uuid/uuid.a -lib/ocaml/site-lib/uuid/uuid.cma -lib/ocaml/site-lib/uuid/uuid.cmi -lib/ocaml/site-lib/uuid/uuid.cmx -lib/ocaml/site-lib/uuid/uuid.cmxa -lib/ocaml/site-lib/xb/META -lib/ocaml/site-lib/xb/dllxb_stubs.so -lib/ocaml/site-lib/xb/libxb_stubs.a -lib/ocaml/site-lib/xb/op.cmi -lib/ocaml/site-lib/xb/op.cmx -lib/ocaml/site-lib/xb/packet.cmi -lib/ocaml/site-lib/xb/packet.cmx -lib/ocaml/site-lib/xb/partial.cmx -lib/ocaml/site-lib/xb/xb.a -lib/ocaml/site-lib/xb/xb.cma -lib/ocaml/site-lib/xb/xb.cmi -lib/ocaml/site-lib/xb/xb.cmx -lib/ocaml/site-lib/xb/xb.cmxa -lib/ocaml/site-lib/xb/xs_ring.cmx -lib/ocaml/site-lib/xc/META -lib/ocaml/site-lib/xc/dllxc_stubs.so -lib/ocaml/site-lib/xc/libxc_stubs.a -lib/ocaml/site-lib/xc/xc.a -lib/ocaml/site-lib/xc/xc.cma -lib/ocaml/site-lib/xc/xc.cmi -lib/ocaml/site-lib/xc/xc.cmx -lib/ocaml/site-lib/xc/xc.cmxa -lib/ocaml/site-lib/xl/META -lib/ocaml/site-lib/xl/dllxl_stubs.so -lib/ocaml/site-lib/xl/libxl_stubs.a -lib/ocaml/site-lib/xl/xl.a -lib/ocaml/site-lib/xl/xl.cma -lib/ocaml/site-lib/xl/xl.cmi -lib/ocaml/site-lib/xl/xl.cmx -lib/ocaml/site-lib/xl/xl.cmxa -lib/ocaml/site-lib/xs/META -lib/ocaml/site-lib/xs/queueop.cmx -lib/ocaml/site-lib/xs/xs.a -lib/ocaml/site-lib/xs/xs.cma -lib/ocaml/site-lib/xs/xs.cmi -lib/ocaml/site-lib/xs/xs.cmx -lib/ocaml/site-lib/xs/xs.cmxa -lib/ocaml/site-lib/xs/xs.mli -lib/ocaml/site-lib/xs/xsraw.cmi -lib/ocaml/site-lib/xs/xsraw.cmx -lib/ocaml/site-lib/xs/xsraw.mli -lib/ocaml/site-lib/xs/xst.cmi -lib/ocaml/site-lib/xs/xst.cmx -lib/ocaml/site-lib/xs/xst.mli -${PYSITELIB}/fsimage.so -${PYSITELIB}/grub/ExtLinuxConf.py -${PYSITELIB}/grub/ExtLinuxConf.pyc -${PYSITELIB}/grub/GrubConf.py -${PYSITELIB}/grub/GrubConf.pyc -${PYSITELIB}/grub/LiloConf.py -${PYSITELIB}/grub/LiloConf.pyc -${PYSITELIB}/grub/__init__.py -${PYSITELIB}/grub/__init__.pyc -${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/flask.so -${PYSITELIB}/xen/lowlevel/ptsname.so -${PYSITELIB}/xen/lowlevel/xc.so -${PYSITELIB}/xen/lowlevel/xl.so -${PYSITELIB}/xen/lowlevel/xs.so -${PYSITELIB}/xen/remus/__init__.py -${PYSITELIB}/xen/remus/__init__.pyc -${PYSITELIB}/xen/remus/blkdev.py -${PYSITELIB}/xen/remus/blkdev.pyc -${PYSITELIB}/xen/remus/device.py -${PYSITELIB}/xen/remus/device.pyc -${PYSITELIB}/xen/remus/image.py -${PYSITELIB}/xen/remus/image.pyc -${PYSITELIB}/xen/remus/netlink.py -${PYSITELIB}/xen/remus/netlink.pyc -${PYSITELIB}/xen/remus/profile.py -${PYSITELIB}/xen/remus/profile.pyc -${PYSITELIB}/xen/remus/qdisc.py -${PYSITELIB}/xen/remus/qdisc.pyc -${PYSITELIB}/xen/remus/save.py -${PYSITELIB}/xen/remus/save.pyc -${PYSITELIB}/xen/remus/tapdisk.py -${PYSITELIB}/xen/remus/tapdisk.pyc -${PYSITELIB}/xen/remus/util.py -${PYSITELIB}/xen/remus/util.pyc -${PYSITELIB}/xen/remus/vbd.py -${PYSITELIB}/xen/remus/vbd.pyc -${PYSITELIB}/xen/remus/vdi.py -${PYSITELIB}/xen/remus/vdi.pyc -${PYSITELIB}/xen/remus/vif.py -${PYSITELIB}/xen/remus/vif.pyc -${PYSITELIB}/xen/remus/vm.py -${PYSITELIB}/xen/remus/vm.pyc -${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/acmpolicy.py -${PYSITELIB}/xen/util/acmpolicy.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/bootloader.py -${PYSITELIB}/xen/util/bootloader.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/fileuri.py -${PYSITELIB}/xen/util/fileuri.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/oshelp.py -${PYSITELIB}/xen/util/oshelp.pyc -${PYSITELIB}/xen/util/path.py -${PYSITELIB}/xen/util/path.pyc -${PYSITELIB}/xen/util/pci.py -${PYSITELIB}/xen/util/pci.pyc -${PYSITELIB}/xen/util/rwlock.py -${PYSITELIB}/xen/util/rwlock.pyc -${PYSITELIB}/xen/util/sxputils.py -${PYSITELIB}/xen/util/sxputils.pyc -${PYSITELIB}/xen/util/utils.py -${PYSITELIB}/xen/util/utils.pyc -${PYSITELIB}/xen/util/vscsi_util.py -${PYSITELIB}/xen/util/vscsi_util.pyc -${PYSITELIB}/xen/util/vusb_util.py -${PYSITELIB}/xen/util/vusb_util.pyc -${PYSITELIB}/xen/util/xmlrpcclient.py -${PYSITELIB}/xen/util/xmlrpcclient.pyc -${PYSITELIB}/xen/util/xmlrpclib2.py -${PYSITELIB}/xen/util/xmlrpclib2.pyc -${PYSITELIB}/xen/util/xpopen.py -${PYSITELIB}/xen/util/xpopen.pyc -${PYSITELIB}/xen/util/xsconstants.py -${PYSITELIB}/xen/util/xsconstants.pyc -${PYSITELIB}/xen/util/xsm/__init__.py -${PYSITELIB}/xen/util/xsm/__init__.pyc -${PYSITELIB}/xen/util/xsm/acm/__init__.py -${PYSITELIB}/xen/util/xsm/acm/__init__.pyc -${PYSITELIB}/xen/util/xsm/acm/acm.py -${PYSITELIB}/xen/util/xsm/acm/acm.pyc -${PYSITELIB}/xen/util/xsm/dummy/__init__.py -${PYSITELIB}/xen/util/xsm/dummy/__init__.pyc -${PYSITELIB}/xen/util/xsm/dummy/dummy.py -${PYSITELIB}/xen/util/xsm/dummy/dummy.pyc -${PYSITELIB}/xen/util/xsm/flask/__init__.py -${PYSITELIB}/xen/util/xsm/flask/__init__.pyc -${PYSITELIB}/xen/util/xsm/flask/flask.py -${PYSITELIB}/xen/util/xsm/flask/flask.pyc -${PYSITELIB}/xen/util/xsm/xsm.py -${PYSITELIB}/xen/util/xsm/xsm.pyc -${PYSITELIB}/xen/util/xsm/xsm_core.py -${PYSITELIB}/xen/util/xsm/xsm_core.pyc -${PYSITELIB}/xen/util/xspolicy.py -${PYSITELIB}/xen/util/xspolicy.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/MemoryPool.py -${PYSITELIB}/xen/xend/MemoryPool.pyc -${PYSITELIB}/xen/xend/PrettyPrint.py -${PYSITELIB}/xen/xend/PrettyPrint.pyc -${PYSITELIB}/xen/xend/Vifctl.py -${PYSITELIB}/xen/xend/Vifctl.pyc -${PYSITELIB}/xen/xend/XendAPI.py -${PYSITELIB}/xen/xend/XendAPI.pyc -${PYSITELIB}/xen/xend/XendAPIConstants.py -${PYSITELIB}/xen/xend/XendAPIConstants.pyc -${PYSITELIB}/xen/xend/XendAPIStore.py -${PYSITELIB}/xen/xend/XendAPIStore.pyc -${PYSITELIB}/xen/xend/XendAPIVersion.py -${PYSITELIB}/xen/xend/XendAPIVersion.pyc -${PYSITELIB}/xen/xend/XendAuthSessions.py -${PYSITELIB}/xen/xend/XendAuthSessions.pyc -${PYSITELIB}/xen/xend/XendBase.py -${PYSITELIB}/xen/xend/XendBase.pyc -${PYSITELIB}/xen/xend/XendBootloader.py -${PYSITELIB}/xen/xend/XendBootloader.pyc -${PYSITELIB}/xen/xend/XendCPUPool.py -${PYSITELIB}/xen/xend/XendCPUPool.pyc -${PYSITELIB}/xen/xend/XendCheckpoint.py -${PYSITELIB}/xen/xend/XendCheckpoint.pyc -${PYSITELIB}/xen/xend/XendClient.py -${PYSITELIB}/xen/xend/XendClient.pyc -${PYSITELIB}/xen/xend/XendConfig.py -${PYSITELIB}/xen/xend/XendConfig.pyc -${PYSITELIB}/xen/xend/XendConstants.py -${PYSITELIB}/xen/xend/XendConstants.pyc -${PYSITELIB}/xen/xend/XendDPCI.py -${PYSITELIB}/xen/xend/XendDPCI.pyc -${PYSITELIB}/xen/xend/XendDSCSI.py -${PYSITELIB}/xen/xend/XendDSCSI.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/XendLocalStorageRepo.py -${PYSITELIB}/xen/xend/XendLocalStorageRepo.pyc -${PYSITELIB}/xen/xend/XendLogging.py -${PYSITELIB}/xen/xend/XendLogging.pyc -${PYSITELIB}/xen/xend/XendMonitor.py -${PYSITELIB}/xen/xend/XendMonitor.pyc -${PYSITELIB}/xen/xend/XendNetwork.py -${PYSITELIB}/xen/xend/XendNetwork.pyc -${PYSITELIB}/xen/xend/XendNode.py -${PYSITELIB}/xen/xend/XendNode.pyc -${PYSITELIB}/xen/xend/XendOptions.py -${PYSITELIB}/xen/xend/XendOptions.pyc -${PYSITELIB}/xen/xend/XendPBD.py -${PYSITELIB}/xen/xend/XendPBD.pyc -${PYSITELIB}/xen/xend/XendPIF.py -${PYSITELIB}/xen/xend/XendPIF.pyc -${PYSITELIB}/xen/xend/XendPIFMetrics.py -${PYSITELIB}/xen/xend/XendPIFMetrics.pyc -${PYSITELIB}/xen/xend/XendPPCI.py -${PYSITELIB}/xen/xend/XendPPCI.pyc -${PYSITELIB}/xen/xend/XendPSCSI.py -${PYSITELIB}/xen/xend/XendPSCSI.pyc -${PYSITELIB}/xen/xend/XendProtocol.py -${PYSITELIB}/xen/xend/XendProtocol.pyc -${PYSITELIB}/xen/xend/XendQCoWStorageRepo.py -${PYSITELIB}/xen/xend/XendQCoWStorageRepo.pyc -${PYSITELIB}/xen/xend/XendSXPDev.py -${PYSITELIB}/xen/xend/XendSXPDev.pyc -${PYSITELIB}/xen/xend/XendStateStore.py -${PYSITELIB}/xen/xend/XendStateStore.pyc -${PYSITELIB}/xen/xend/XendStorageRepository.py -${PYSITELIB}/xen/xend/XendStorageRepository.pyc -${PYSITELIB}/xen/xend/XendTask.py -${PYSITELIB}/xen/xend/XendTask.pyc -${PYSITELIB}/xen/xend/XendTaskManager.py -${PYSITELIB}/xen/xend/XendTaskManager.pyc -${PYSITELIB}/xen/xend/XendVDI.py -${PYSITELIB}/xen/xend/XendVDI.pyc -${PYSITELIB}/xen/xend/XendVMMetrics.py -${PYSITELIB}/xen/xend/XendVMMetrics.pyc -${PYSITELIB}/xen/xend/XendVnet.py -${PYSITELIB}/xen/xend/XendVnet.pyc -${PYSITELIB}/xen/xend/XendXSPolicy.py -${PYSITELIB}/xen/xend/XendXSPolicy.pyc -${PYSITELIB}/xen/xend/XendXSPolicyAdmin.py -${PYSITELIB}/xen/xend/XendXSPolicyAdmin.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/osdep.py -${PYSITELIB}/xen/xend/osdep.pyc -${PYSITELIB}/xen/xend/server/BlktapController.py -${PYSITELIB}/xen/xend/server/BlktapController.pyc -${PYSITELIB}/xen/xend/server/ConsoleController.py -${PYSITELIB}/xen/xend/server/ConsoleController.pyc -${PYSITELIB}/xen/xend/server/DevConstants.py -${PYSITELIB}/xen/xend/server/DevConstants.pyc -${PYSITELIB}/xen/xend/server/DevController.py -${PYSITELIB}/xen/xend/server/DevController.pyc -${PYSITELIB}/xen/xend/server/SSLXMLRPCServer.py -${PYSITELIB}/xen/xend/server/SSLXMLRPCServer.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/XMLRPCServer.py -${PYSITELIB}/xen/xend/server/XMLRPCServer.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/netif2.py -${PYSITELIB}/xen/xend/server/netif2.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/udevevent.py -${PYSITELIB}/xen/xend/server/udevevent.pyc -${PYSITELIB}/xen/xend/server/vfbif.py -${PYSITELIB}/xen/xend/server/vfbif.pyc -${PYSITELIB}/xen/xend/server/vscsiif.py -${PYSITELIB}/xen/xend/server/vscsiif.pyc -${PYSITELIB}/xen/xend/server/vusbif.py -${PYSITELIB}/xen/xend/server/vusbif.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_XendConfig.py -${PYSITELIB}/xen/xend/tests/test_XendConfig.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/XenAPI.py -${PYSITELIB}/xen/xm/XenAPI.pyc -${PYSITELIB}/xen/xm/__init__.py -${PYSITELIB}/xen/xm/__init__.pyc -${PYSITELIB}/xen/xm/addlabel.py -${PYSITELIB}/xen/xm/addlabel.pyc -${PYSITELIB}/xen/xm/console.py -${PYSITELIB}/xen/xm/console.pyc -${PYSITELIB}/xen/xm/cpupool-create.py -${PYSITELIB}/xen/xm/cpupool-create.pyc -${PYSITELIB}/xen/xm/cpupool-new.py -${PYSITELIB}/xen/xm/cpupool-new.pyc -${PYSITELIB}/xen/xm/cpupool.py -${PYSITELIB}/xen/xm/cpupool.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/getenforce.py -${PYSITELIB}/xen/xm/getenforce.pyc -${PYSITELIB}/xen/xm/getlabel.py -${PYSITELIB}/xen/xm/getlabel.pyc -${PYSITELIB}/xen/xm/getpolicy.py -${PYSITELIB}/xen/xm/getpolicy.pyc -${PYSITELIB}/xen/xm/help.py -${PYSITELIB}/xen/xm/help.pyc -${PYSITELIB}/xen/xm/labels.py -${PYSITELIB}/xen/xm/labels.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/resetpolicy.py -${PYSITELIB}/xen/xm/resetpolicy.pyc -${PYSITELIB}/xen/xm/resources.py -${PYSITELIB}/xen/xm/resources.pyc -${PYSITELIB}/xen/xm/rmlabel.py -${PYSITELIB}/xen/xm/rmlabel.pyc -${PYSITELIB}/xen/xm/setenforce.py -${PYSITELIB}/xen/xm/setenforce.pyc -${PYSITELIB}/xen/xm/setpolicy.py -${PYSITELIB}/xen/xm/setpolicy.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 -${PYSITELIB}/xen/xm/xenapi_create.py -${PYSITELIB}/xen/xm/xenapi_create.pyc -${PYSITELIB}/xen/xsview/__init__.py -${PYSITELIB}/xen/xsview/__init__.pyc -${PYSITELIB}/xen/xsview/main.py -${PYSITELIB}/xen/xsview/main.pyc -${PYSITELIB}/xen/xsview/xsviewer.py -${PYSITELIB}/xen/xsview/xsviewer.pyc -lib/xen/boot/hvmloader -libexec/qemu-dm -man/man1/xentop.1 -man/man1/xentrace_format.1 -man/man1/xm.1 -man/man5/xend-config.sxp.5 -man/man5/xmdomain.cfg.5 -man/man8/xentrace.8 -sbin/blktapctrl -sbin/flask-getenforce -sbin/flask-loadpolicy -sbin/flask-setenforce -sbin/gdbsx -sbin/gtracestat -sbin/gtraceview -sbin/img2qcow -sbin/kdd -sbin/oxenstored -sbin/qcow-create -sbin/qcow2raw -sbin/tapdisk -sbin/xen-bugtool -sbin/xen-hptool -sbin/xen-hvmcrash -sbin/xen-hvmctx -sbin/xen-python-path -sbin/xen-tmem-list-parse -sbin/xenbackendd -sbin/xenbaked -sbin/xenconsoled -sbin/xend -sbin/xenlockprof -sbin/xenmon.py -sbin/xenpaging -sbin/xenperf -sbin/xenpm -sbin/xenpmd -sbin/xenstored -sbin/xentop -sbin/xentrace_setmask -sbin/xenwatchdogd -sbin/xl -sbin/xm -sbin/xsview -share/doc/xen/README.blktap -share/doc/xen/README.xenmon -share/examples/xen/README -share/examples/xen/README.incompatibilities -share/examples/xen/cpupool -share/examples/xen/formats -share/examples/xen/scripts/hotplugpath.sh -share/examples/xen/scripts/block -share/examples/xen/scripts/qemu-ifup -share/examples/xen/scripts/vif-bridge -share/examples/xen/scripts/vif-ip -share/examples/xen/xend-config.sxp -share/examples/xen/xend-pci-permissive.sxp -share/examples/xen/xend-pci-quirks.sxp -share/examples/xen/xl.conf -share/examples/xen/xl.sh -share/examples/xen/xm-config.xml -share/examples/xen/xmexample.hvm -share/examples/xen/xmexample.hvm-stubdom -share/examples/xen/xmexample.nbd -share/examples/xen/xmexample.pv-grub -share/examples/xen/xmexample.vti -share/examples/xen/xmexample1 -share/examples/xen/xmexample2 -share/examples/xen/xmexample3 -share/xen/create.dtd -share/xen/qemu/bamboo.dtb -share/xen/qemu/bios.bin -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 -share/xen/qemu/openbios-ppc -share/xen/qemu/openbios-sparc32 -share/xen/qemu/openbios-sparc64 -share/xen/qemu/ppc_rom.bin -share/xen/qemu/pxe-e1000.bin -share/xen/qemu/pxe-ne2k_pci.bin -share/xen/qemu/pxe-pcnet.bin -share/xen/qemu/pxe-rtl8139.bin -share/xen/qemu/vgabios-cirrus.bin -share/xen/qemu/vgabios.bin -share/xen/qemu/video.x -@pkgdir share/examples/xen/auto diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo deleted file mode 100644 index 4c7d5aaeb4a..00000000000 --- a/sysutils/xentools41/distinfo +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: distinfo,v 1.44 2016/12/20 10:22:29 bouyer Exp $ - -SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 -RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 -SHA512 (ipxe-git-v1.0.0.tar.gz) = 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 -Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes -SHA1 (xen-4.1.6.1.tar.gz) = e5f15feb0821578817a65ede16110c6eac01abd0 -RMD160 (xen-4.1.6.1.tar.gz) = bff11421fc44a26f2cc3156713267abcb36d7a19 -SHA512 (xen-4.1.6.1.tar.gz) = 5f6106514ffb57708009e3d6763824b13d9038699048d1a91fa09ad223e0391b92b6ea0f25714a0bbf8ac8373c58fc7871ca0bce9c3ff7873d41fb2eeae13ed8 -Size (xen-4.1.6.1.tar.gz) = 10428485 bytes -SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 -SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba -SHA1 (patch-.._.._ipxe_src_net_tls.c) = c0cfbc2ab2b92c659c146601c4f80d58c951ca62 -SHA1 (patch-.._Config.mk) = 9b971a41f67bb3974d3a4459bb9d96fbbd636c96 -SHA1 (patch-CVE-2014-1950) = b0d900722fd0f59a50f1e1eda1471105d5b557e5 -SHA1 (patch-CVE-2015-2752) = f9bca0b8744233e20ff97c3e8e2e404522e87f49 -SHA1 (patch-CVE-2015-2756) = 07aaac4bcd0dfc6d708c1823288b9fc789ebd125 -SHA1 (patch-CVE-2015-8550) = dfd72a54d27211c1059579819b9b4c702399a0fc -SHA1 (patch-CVE-2015-8554) = 7f444009519399038c657fa3e59fd2170f99bb70 -SHA1 (patch-XSA-197) = 4980664bbb3f3d8277f888f6304a8552ec714a26 -SHA1 (patch-XSA-198) = 98a18927de1e3427cb4fbcc5675fa608d1cd5ba8 -SHA1 (patch-XSA-199) = 406f14cdb356f0d7abe3a843a5efa1dc398c77bd -SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada -SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d -SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb -SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175 -SHA1 (patch-ae) = 400bd6cac23af1e75f45c3e4e88e3130a3517129 -SHA1 (patch-af) = e866e7d96766b735a53432350275810803eeb510 -SHA1 (patch-ag) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 -SHA1 (patch-ah) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2 -SHA1 (patch-ai) = 8da6bba38bd7677ea829ca35058f7d2d1d7acad4 -SHA1 (patch-aj) = d0999d8dcbc1eef4de7037db0e54dcd8d2f706eb -SHA1 (patch-ak) = 722a6b0541b036d84c703037134e25bc47f3eb65 -SHA1 (patch-al) = d9a310c16db708dd86170a13946f87e4cd21eb7a -SHA1 (patch-am) = b89785a97208454eb3f2e1e43ba4674ad0828aa6 -SHA1 (patch-ba) = 2c65e4b4b85e91e92dfb3aa402ebc44694bdff06 -SHA1 (patch-bb) = 64a61fb156bcb6a99ff0963063a0716b808e3b61 -SHA1 (patch-bc) = 25c99a428fda6dee709888ddbcfdcfef5f654564 -SHA1 (patch-ca) = 36afc7b063f83adfe5b927ed0be586b102684020 -SHA1 (patch-cb) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 -SHA1 (patch-cc) = 24d71f68a93b59bd5c5441c257d34862e7302040 -SHA1 (patch-cd) = 7b25b3b3a8d58effae395d776f2a4b94d79acfcb -SHA1 (patch-ce) = 613f4c4605af860e5f88b68c49a0e7870ba6ecde -SHA1 (patch-cf) = c8740b1c9cfac686f2e4e32c7613b5f02206459d -SHA1 (patch-cg) = 119029fda1d4ecee90d0a108151596cb3ef0ec74 -SHA1 (patch-ch) = 84e816c95167828314ef901e324772249a407c41 -SHA1 (patch-config_StdGNU.mk) = bbded4d6da3fae55bfd8dad42ac9b45721ee1ebe -SHA1 (patch-da) = 06c07b32d70f8259a762ebcdc738218cfad57ad4 -SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d -SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e -SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 -SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d -SHA1 (patch-df) = e7b41242fcb4a0d4fb9e22376af6a50d1081f96c -SHA1 (patch-firmware_hvmloader_Makefile) = b2914e4988ba004d45403d67f1580b1f9725d006 -SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989 -SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886 -SHA1 (patch-ioemu-qemu-xen_hw_piix4acpi.c) = ca19457e9bde2d844a86a866960ac6de1f3d084c -SHA1 (patch-ioemu-qemu-xen_hw_pt-graphics.c) = 3c03404f1d711c667559a1332e717a5f1b5ceda8 -SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.c) = 2dcebc65f591988bb95dea74c3b21f7066154a9f -SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.h) = d1bb1a8ad90d6577056f11df96f5469ffe74a3b0 -SHA1 (patch-ioemu-qemu-xen_xen-hooks.mak) = a00d9a9fd0fbb9fd89788b9dfaf5b389a28d47e2 -SHA1 (patch-libfsimage_ufs_ufs.h) = dc59f33cf3abd08a8cdee5977ca4168613327513 -SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0 -SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9 -SHA1 (patch-libxl_xl__cmdimpl.c) = 0e038b9702e131ec527d49cb2c21e4acf581cbfe -SHA1 (patch-ocaml_Makefile.rules) = 104f9d40186e5e4ca6a2e6359bbb369c3c91d1dc -SHA1 (patch-ocaml_common.make) = c59d32301198d65691ab23529dd791de5ac40199 -SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04 -SHA1 (patch-ocaml_xenstored_define.ml) = f44841625554ceba6e83dbb41f688993c2a8d9a2 -SHA1 (patch-ocaml_xenstored_utils.ml) = cc792a696743fa348b274b1c23783ea1a0d7da47 -SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 -SHA1 (patch-xenstat_libxenstat_Makefile) = 800dfa58e9f65cfc9694ff4ee8a85c96d6336cfe -SHA1 (patch-xenstat_xentop_Makefile) = 6b59d1a8024f0b7f493a2205afd1d90495f01151 -SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7 diff --git a/sysutils/xentools41/files/blk_netbsd.c b/sysutils/xentools41/files/blk_netbsd.c deleted file mode 100644 index 81076a25a4d..00000000000 --- a/sysutils/xentools41/files/blk_netbsd.c +++ /dev/null @@ -1,39 +0,0 @@ -#include <inttypes.h> -#include <sys/ioctl.h> -#include <sys/disklabel.h> -#include "tapdisk.h" -#include "blk.h" - -int blk_getimagesize(int fd, uint64_t *size) -{ - int rc; - struct disklabel dl; - - *size = 0; - rc = ioctl(fd, DIOCGDINFO, &dl); - if (rc) { - DPRINTF("ERR: DIOCGDINFO failed, couldn't stat image"); - return -EINVAL; - } - - *size = dl.d_secsize * dl.d_secpercyl; - - return 0; -} - -int blk_getsectorsize(int fd, uint64_t *sector_size) -{ - int rc; - struct disklabel dl; - - *sector_size = DEV_BSIZE; - rc = ioctl(fd, DIOCGDINFO, &dl); - if (rc) { - DPRINTF("ERR: DIOCGDINFO failed, couldn't stat image"); - return 0; /* fallback to DEV_BSIZE */ - } - - *sector_size = dl.d_secsize; - return 0; -} - diff --git a/sysutils/xentools41/files/blktapctrl_netbsd.c b/sysutils/xentools41/files/blktapctrl_netbsd.c deleted file mode 100644 index 02a1e9f3018..00000000000 --- a/sysutils/xentools41/files/blktapctrl_netbsd.c +++ /dev/null @@ -1,16 +0,0 @@ - -#include "blktaplib.h" -#include "blktapctrl.h" - - -int blktap_interface_open(void) -{ - /* not yet implemented */ - return -1; -} - -int blktap_interface_create(int ctlfd, int *major, int *minor, blkif_t *blkif) -{ - /* not yet implemented */ - return -1; -} diff --git a/sysutils/xentools41/files/xen-watchdog.sh b/sysutils/xentools41/files/xen-watchdog.sh deleted file mode 100644 index 4d2a96b24ce..00000000000 --- a/sysutils/xentools41/files/xen-watchdog.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# PROVIDE: xen-watchdog -# REQUIRE: DAEMON -# -# description: Run domain watchdog daemon -# - -. /etc/rc.subr - -name="xenwatchdog" -rcvar=$name -command="@PREFIX@/sbin/xenwatchdogd" -start_cmd="echo Starting ${name}. && PATH=${PATH}:@PREFIX@/sbin ${command} 30 15" - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/xentools41/files/xencommons.sh b/sysutils/xentools41/files/xencommons.sh deleted file mode 100644 index 62403c37ccd..00000000000 --- a/sysutils/xentools41/files/xencommons.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# PROVIDE: xencommons -# REQUIRE: DAEMON - -. /etc/rc.subr - -name="xencommons" -rcvar=xend -start_precmd="xen_precmd" -start_cmd="xen_startcmd" -stop_cmd="xen_stop" -status_cmd="xen_status" -extra_commands="status" -required_files="/kern/xen/privcmd" - -XENSTORED_PIDFILE="/var/run/xenstored.pid" -XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid" -XENBACKENDD_PIDFILE="/var/run/xenbackendd.pid" - -SBINDIR=@PREFIX@/sbin - -xen_precmd() -{ - mkdir -p /var/run/xend || exit 1 - mkdir -p /var/run/xend/boot || exit 1 - mkdir -p /var/run/xenstored || exit 1 -} - -xen_startcmd() -{ - printf "Starting xenservices: xenstored, xenconsoled, xenbackendd.\n" - XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}" - if [ -n "${XENSTORED_TRACE}" ]; then - XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" - fi - - ${SBINDIR}/xenstored ${XENSTORED_ARGS} - sleep 5 - - XENCONSOLED_ARGS="" - if [ -n "${XENCONSOLED_TRACE}" ]; then - XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" - fi - - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} - - XENBACKENDD_ARGS="" - if [ -n "${XENBACKENDD_DEBUG}" ]; then - XENBACKENDD_ARGS="${XENBACKENDD_ARGS} -d" - fi - - ${SBINDIR}/xenbackendd ${XENBACKENDD_ARGS} -} - -xen_stop() -{ - pids="" - printf "Stopping xencommons" - - rc_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) - pids="$pids $rc_pid" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) - pids="$pids $rc_pid" - rc_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) - pids="$pids $rc_pid" - - kill -${sig_stop:-TERM} $pids - wait_for_pids $pids - - printf ".\n" -} - -xen_status() -{ - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) - if test -n ${xenstored_pid}; then - pids="$pids $xenstored_pid" - fi - - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) - if test -n ${xenconsoled_pid}; then - pids="$pids $xenconsoled_pid" - fi - - xenbackend_pid=$(check_pidfile ${XENBACKENDD_PIDFILE} ${SBINDIR}/xenbackendd) - if test -n ${xenbackend_pid}; then - pids="$pids $xenbackend_pid" - fi - - if test -n "$xenbackend_pid" -a -n "$xenconsoled_pid" -a -n "$xenstored_pid"; - then - echo "xencommons are running as pids $pids." - return 0 - fi - if test -z "$xenbackend_pid" -a -z "$xenconsoled_pid" -a -z "$xenstored_pid"; - then - echo "xencommons are not running." - return 0 - fi - - if test -n $xenstored_pid; then - echo "xenstored is running as pid $xenstored_pid." - else - echo "xenstored is not running." - fi - if test -n $xenconsoled_pid; then - echo "xenconsoled is running as pid $xenconsoled_pid." - else - echo "xenconsoled is not running." - fi - if test -n $xenbackend_pid; then - echo "xenbackendd is running as pid $xenbackend_pid." - else - echo "xenbackendd is not running." - fi -} - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/xentools41/files/xend.sh b/sysutils/xentools41/files/xend.sh deleted file mode 100644 index 9bd4b870e9b..00000000000 --- a/sysutils/xentools41/files/xend.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# PROVIDE: xend -# REQUIRE: xencommons - -. /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" -pidfile="/var/run/xend.pid" - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/xentools41/files/xendomains.sh b/sysutils/xentools41/files/xendomains.sh deleted file mode 100644 index 92390adddbb..00000000000 --- a/sysutils/xentools41/files/xendomains.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# PROVIDE: xendomains -# REQUIRE: xend -# 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" -required_files="/kern/xen/privcmd" - -xendomains_start() -{ - [ -n "$xendomains" ] || return - - 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 - if ! $cmdline; then - echo "Pre-hook \`\`$cmdline'' failed... skipping $domain." - continue - fi - 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 $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/xentools41/patches/patch-.._.._ipxe_src_arch_i386_include_librm.h b/sysutils/xentools41/patches/patch-.._.._ipxe_src_arch_i386_include_librm.h deleted file mode 100644 index 8627e8a2470..00000000000 --- a/sysutils/xentools41/patches/patch-.._.._ipxe_src_arch_i386_include_librm.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-.._.._ipxe_src_arch_i386_include_librm.h,v 1.1 2013/04/11 19:57:53 joerg Exp $ - ---- ../../ipxe/src/arch/i386/include/librm.h.orig 2010-02-02 16:12:44.000000000 +0000 -+++ ../../ipxe/src/arch/i386/include/librm.h -@@ -122,8 +122,9 @@ extern char *text16; - _data16_ ## variable __asm__ ( #variable ) - - #define __bss16_array( variable, array ) \ -- __attribute__ (( section ( ".bss16" ) )) \ -- _data16_ ## variable array __asm__ ( #variable ) -+ _data16_ ## variable array \ -+ __asm__ ( #variable ) \ -+ __attribute__ (( section ( ".bss16" ) )) - - #define __text16( variable ) \ - __attribute__ (( section ( ".text16.data" ) )) \ diff --git a/sysutils/xentools41/patches/patch-.._.._ipxe_src_core_settings.c b/sysutils/xentools41/patches/patch-.._.._ipxe_src_core_settings.c deleted file mode 100644 index 5b5bdbc27d6..00000000000 --- a/sysutils/xentools41/patches/patch-.._.._ipxe_src_core_settings.c +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-.._.._ipxe_src_core_settings.c,v 1.1 2013/04/11 19:57:53 joerg Exp $ - ---- ../../ipxe/src/core/settings.c.orig 2013-03-25 18:48:57.000000000 +0000 -+++ ../../ipxe/src/core/settings.c -@@ -263,10 +263,12 @@ static struct settings * find_child_sett - */ - static struct settings * autovivify_child_settings ( struct settings *parent, - const char *name ) { -+ size_t nlen = strlen ( name ) + 1 /* NUL */; - struct { - struct generic_settings generic; -- char name[ strlen ( name ) + 1 /* NUL */ ]; -+ char name[]; - } *new_child; -+ size_t tlen = sizeof(*new_child) + nlen; - struct settings *settings; - - /* Return existing settings, if existent */ -@@ -274,13 +276,13 @@ static struct settings * autovivify_chil - return settings; - - /* Create new generic settings block */ -- new_child = zalloc ( sizeof ( *new_child ) ); -+ new_child = zalloc ( tlen ); - if ( ! new_child ) { - DBGC ( parent, "Settings %p could not create child %s\n", - parent, name ); - return NULL; - } -- memcpy ( new_child->name, name, sizeof ( new_child->name ) ); -+ memcpy ( new_child->name, name, nlen ); - generic_settings_init ( &new_child->generic, NULL, new_child->name ); - settings = &new_child->generic.settings; - register_settings ( settings, parent ); diff --git a/sysutils/xentools41/patches/patch-.._.._ipxe_src_net_tls.c b/sysutils/xentools41/patches/patch-.._.._ipxe_src_net_tls.c deleted file mode 100644 index 6a3da777c66..00000000000 --- a/sysutils/xentools41/patches/patch-.._.._ipxe_src_net_tls.c +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.1 2013/04/11 19:57:53 joerg Exp $ - ---- ../../ipxe/src/net/tls.c.orig 2013-03-25 18:53:57.000000000 +0000 -+++ ../../ipxe/src/net/tls.c -@@ -650,18 +650,22 @@ static int tls_send_client_key_exchange - RSA_CTX *rsa_ctx; - RSA_pub_key_new ( &rsa_ctx, tls->rsa.modulus, tls->rsa.modulus_len, - tls->rsa.exponent, tls->rsa.exponent_len ); -+ size_t elen = rsa_ctx->num_octets; - struct { - uint32_t type_length; - uint16_t encrypted_pre_master_secret_len; -- uint8_t encrypted_pre_master_secret[rsa_ctx->num_octets]; -- } __attribute__ (( packed )) key_xchg; -- -- memset ( &key_xchg, 0, sizeof ( key_xchg ) ); -- key_xchg.type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | -- htonl ( sizeof ( key_xchg ) - -- sizeof ( key_xchg.type_length ) ) ); -- key_xchg.encrypted_pre_master_secret_len -- = htons ( sizeof ( key_xchg.encrypted_pre_master_secret ) ); -+ uint8_t encrypted_pre_master_secret[]; -+ } __attribute__ (( packed )) *key_xchg; -+ size_t klen = sizeof(*key_xchg) + elen; -+ -+ key_xchg = alloca(klen); -+ -+ memset ( key_xchg, 0, klen ); -+ key_xchg->type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | -+ htonl ( klen - -+ sizeof ( key_xchg->type_length ) ) ); -+ key_xchg->encrypted_pre_master_secret_len -+ = htons ( elen ); - - /* FIXME: Hack alert */ - DBGC ( tls, "RSA encrypting plaintext, modulus, exponent:\n" ); -@@ -671,14 +675,13 @@ static int tls_send_client_key_exchange - DBGC_HD ( tls, tls->rsa.exponent, tls->rsa.exponent_len ); - RSA_encrypt ( rsa_ctx, ( const uint8_t * ) &tls->pre_master_secret, - sizeof ( tls->pre_master_secret ), -- key_xchg.encrypted_pre_master_secret, 0 ); -+ key_xchg->encrypted_pre_master_secret, 0 ); - DBGC ( tls, "RSA encrypt done. Ciphertext:\n" ); -- DBGC_HD ( tls, &key_xchg.encrypted_pre_master_secret, -- sizeof ( key_xchg.encrypted_pre_master_secret ) ); -+ DBGC_HD ( tls, &key_xchg->encrypted_pre_master_secret, elen ); - RSA_free ( rsa_ctx ); - - -- return tls_send_handshake ( tls, &key_xchg, sizeof ( key_xchg ) ); -+ return tls_send_handshake ( tls, key_xchg, klen ); - } - - /** -@@ -802,12 +805,12 @@ static int tls_new_server_hello ( struct - uint8_t session_id_len; - char next[0]; - } __attribute__ (( packed )) *hello_a = data; -+ size_t slen = hello_a->session_id_len; - struct { -- uint8_t session_id[hello_a->session_id_len]; - uint16_t cipher_suite; - uint8_t compression_method; - char next[0]; -- } __attribute__ (( packed )) *hello_b = ( void * ) &hello_a->next; -+ } __attribute__ (( packed )) *hello_b = ( void * ) ((uint8_t *)&hello_a->next + slen); - void *end = hello_b->next; - int rc; - diff --git a/sysutils/xentools41/patches/patch-.._Config.mk b/sysutils/xentools41/patches/patch-.._Config.mk deleted file mode 100644 index 9bf3cef29cd..00000000000 --- a/sysutils/xentools41/patches/patch-.._Config.mk +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-.._Config.mk,v 1.1 2013/04/11 19:57:53 joerg Exp $ - ---- ../Config.mk.orig 2013-03-25 09:51:57.000000000 +0000 -+++ ../Config.mk -@@ -15,7 +15,7 @@ SHELL ?= /bin/sh - # Tools to run on system hosting the build - HOSTCC = gcc - HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer --HOSTCFLAGS += -fno-strict-aliasing -+HOSTCFLAGS += -fno-strict-aliasing ${EXTRA_HOSTCFLAGS} - - DISTDIR ?= $(XEN_ROOT)/dist - DESTDIR ?= / -@@ -141,6 +141,8 @@ CFLAGS += -Wall -Wstrict-prototypes - # result of any casted expression causes a warning. - CFLAGS += -Wno-unused-value - -+CFLAGS += ${EXTRA_CFLAGS} -+ - $(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement) - $(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement) - $(call cc-option-add,CFLAGS,CC,-Wno-unused-but-set-variable) diff --git a/sysutils/xentools41/patches/patch-CVE-2014-1950 b/sysutils/xentools41/patches/patch-CVE-2014-1950 deleted file mode 100644 index 8b00d5b5779..00000000000 --- a/sysutils/xentools41/patches/patch-CVE-2014-1950 +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-CVE-2014-1950,v 1.1 2014/02/13 11:12:58 drochner Exp $ - -http://lists.xenproject.org/archives/html/xen-announce/2014-02/msg00006.html - ---- libxc/xc_cpupool.c.orig 2014-02-12 16:27:31.000000000 +0000 -+++ libxc/xc_cpupool.c 2014-02-12 16:28:11.000000000 +0000 -@@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_ - info->cpumap = xc_cpumap_alloc(xch); - if (!info->cpumap) { - free(info); -+ info = NULL; - goto out; - } - info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; diff --git a/sysutils/xentools41/patches/patch-CVE-2015-2752 b/sysutils/xentools41/patches/patch-CVE-2015-2752 deleted file mode 100644 index fe77b5d644d..00000000000 --- a/sysutils/xentools41/patches/patch-CVE-2015-2752 +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-CVE-2015-2752,v 1.1 2015/04/19 13:13:21 spz Exp $ - -Patch for CVE-2015-2752 aka XSA-125 from -http://xenbits.xenproject.org/xsa/xsa125-4.2.patch - ---- libxc/xc_domain.c.orig 2013-09-10 06:42:18.000000000 +0000 -+++ libxc/xc_domain.c -@@ -1322,6 +1322,13 @@ int xc_domain_bind_pt_isa_irq( - PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); - } - -+#ifndef min -+#define min(X, Y) ({ \ -+ const typeof (X) _x = (X); \ -+ const typeof (Y) _y = (Y); \ -+ (void) (&_x == &_y); \ -+ (_x < _y) ? _x : _y; }) -+#endif - int xc_domain_memory_mapping( - xc_interface *xch, - uint32_t domid, -@@ -1331,17 +1338,55 @@ int xc_domain_memory_mapping( - uint32_t add_mapping) - { - DECLARE_DOMCTL; -+ int ret = 0, err; -+ unsigned long done = 0, nr, max_batch_sz; -+ -+ if ( !nr_mfns ) -+ return 0; - - domctl.cmd = XEN_DOMCTL_memory_mapping; - domctl.domain = domid; -- domctl.u.memory_mapping.first_gfn = first_gfn; -- domctl.u.memory_mapping.first_mfn = first_mfn; -- domctl.u.memory_mapping.nr_mfns = nr_mfns; - domctl.u.memory_mapping.add_mapping = add_mapping; -+ max_batch_sz = nr_mfns; -+ do -+ { -+ nr = min(nr_mfns - done, max_batch_sz); -+ domctl.u.memory_mapping.nr_mfns = nr; -+ domctl.u.memory_mapping.first_gfn = first_gfn + done; -+ domctl.u.memory_mapping.first_mfn = first_mfn + done; -+ err = do_domctl(xch, &domctl); -+ if ( err && errno == E2BIG ) -+ { -+ if ( max_batch_sz <= 1 ) -+ break; -+ max_batch_sz >>= 1; -+ continue; -+ } -+ /* Save the first error... */ -+ if ( !ret ) -+ ret = err; -+ /* .. and ignore the rest of them when removing. */ -+ if ( err && add_mapping != DPCI_REMOVE_MAPPING ) -+ break; -+ -+ done += nr; -+ } while ( done < nr_mfns ); -+ -+ /* -+ * Undo what we have done unless unmapping, by unmapping the entire region. -+ * Errors here are ignored. -+ */ -+ if ( ret && add_mapping != DPCI_REMOVE_MAPPING ) -+ xc_domain_memory_mapping(xch, domid, first_gfn, first_mfn, nr_mfns, -+ DPCI_REMOVE_MAPPING); -+ -+ /* We might get E2BIG so many times that we never advance. */ -+ if ( !done && !ret ) -+ ret = -1; - -- return do_domctl(xch, &domctl); -+ return ret; - } -- -+#undef min - int xc_domain_ioport_mapping( - xc_interface *xch, - uint32_t domid, - diff --git a/sysutils/xentools41/patches/patch-CVE-2015-2756 b/sysutils/xentools41/patches/patch-CVE-2015-2756 deleted file mode 100644 index d8bc6cd63f8..00000000000 --- a/sysutils/xentools41/patches/patch-CVE-2015-2756 +++ /dev/null @@ -1,142 +0,0 @@ -$NetBSD: patch-CVE-2015-2756,v 1.1 2015/04/19 13:13:21 spz Exp $ - -patch for CVE-2015-2756 aka XSA-126 from -http://xenbits.xenproject.org/xsa/xsa126-qemut.patch - ---- ioemu-qemu-xen/hw/pass-through.c.orig 2013-07-17 10:59:40.000000000 +0000 -+++ ioemu-qemu-xen/hw/pass-through.c -@@ -171,9 +171,6 @@ static int pt_word_reg_read(struct pt_de - static int pt_long_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint32_t *value, uint32_t valid_mask); --static int pt_cmd_reg_read(struct pt_dev *ptdev, -- struct pt_reg_tbl *cfg_entry, -- uint16_t *value, uint16_t valid_mask); - static int pt_bar_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint32_t *value, uint32_t valid_mask); -@@ -277,9 +274,9 @@ static struct pt_reg_info_tbl pt_emu_reg - .size = 2, - .init_val = 0x0000, - .ro_mask = 0xF880, -- .emu_mask = 0x0740, -+ .emu_mask = 0x0743, - .init = pt_common_reg_init, -- .u.w.read = pt_cmd_reg_read, -+ .u.w.read = pt_word_reg_read, - .u.w.write = pt_cmd_reg_write, - .u.w.restore = pt_cmd_reg_restore, - }, -@@ -1865,7 +1862,7 @@ static int pt_dev_is_virtfn(struct pci_d - return rc; - } - --static int pt_register_regions(struct pt_dev *assigned_device) -+static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) - { - int i = 0; - uint32_t bar_data = 0; -@@ -1885,17 +1882,26 @@ static int pt_register_regions(struct pt - - /* Register current region */ - if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) -+ { - pci_register_io_region((PCIDevice *)assigned_device, i, - (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, - pt_ioport_map); -+ *cmd |= PCI_COMMAND_IO; -+ } - else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) -+ { - pci_register_io_region((PCIDevice *)assigned_device, i, - (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, - pt_iomem_map); -+ *cmd |= PCI_COMMAND_MEMORY; -+ } - else -+ { - pci_register_io_region((PCIDevice *)assigned_device, i, - (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, - pt_iomem_map); -+ *cmd |= PCI_COMMAND_MEMORY; -+ } - - PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", - (uint32_t)(pci_dev->size[i]), -@@ -3221,27 +3227,6 @@ static int pt_long_reg_read(struct pt_de - return 0; - } - --/* read Command register */ --static int pt_cmd_reg_read(struct pt_dev *ptdev, -- struct pt_reg_tbl *cfg_entry, -- uint16_t *value, uint16_t valid_mask) --{ -- struct pt_reg_info_tbl *reg = cfg_entry->reg; -- uint16_t valid_emu_mask = 0; -- uint16_t emu_mask = reg->emu_mask; -- -- if ( ptdev->is_virtfn ) -- emu_mask |= PCI_COMMAND_MEMORY; -- if ( pt_is_iomul(ptdev) ) -- emu_mask |= PCI_COMMAND_IO; -- -- /* emulate word register */ -- valid_emu_mask = emu_mask & valid_mask; -- *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); -- -- return 0; --} -- - /* read BAR */ - static int pt_bar_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, -@@ -3376,19 +3361,13 @@ static int pt_cmd_reg_write(struct pt_de - uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; - uint16_t wr_value = *value; -- uint16_t emu_mask = reg->emu_mask; -- -- if ( ptdev->is_virtfn ) -- emu_mask |= PCI_COMMAND_MEMORY; -- if ( pt_is_iomul(ptdev) ) -- emu_mask |= PCI_COMMAND_IO; - - /* modify emulate register */ - writable_mask = ~reg->ro_mask & valid_mask; - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~emu_mask & valid_mask; -+ throughable_mask = ~reg->emu_mask & valid_mask; - - if (*value & PCI_COMMAND_DISABLE_INTx) - { -@@ -4151,6 +4130,7 @@ static struct pt_dev * register_real_dev - struct pt_dev *assigned_device = NULL; - struct pci_dev *pci_dev; - uint8_t e_device, e_intx; -+ uint16_t cmd = 0; - char *key, *val; - int msi_translate, power_mgmt; - -@@ -4240,7 +4220,7 @@ static struct pt_dev * register_real_dev - assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); - - /* Handle real device's MMIO/PIO BARs */ -- pt_register_regions(assigned_device); -+ pt_register_regions(assigned_device, &cmd); - - /* Setup VGA bios for passthroughed gfx */ - if ( setup_vga_pt(assigned_device) < 0 ) -@@ -4318,6 +4298,10 @@ static struct pt_dev * register_real_dev - } - - out: -+ if (cmd) -+ pci_write_word(pci_dev, PCI_COMMAND, -+ *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); -+ - PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" - "IRQ type = %s\n", r_bus, r_dev, r_func, - assigned_device->msi_trans_en? "MSI-INTx":"INTx"); diff --git a/sysutils/xentools41/patches/patch-CVE-2015-8550 b/sysutils/xentools41/patches/patch-CVE-2015-8550 deleted file mode 100644 index 739ffba9109..00000000000 --- a/sysutils/xentools41/patches/patch-CVE-2015-8550 +++ /dev/null @@ -1,134 +0,0 @@ -$NetBSD: patch-CVE-2015-8550,v 1.1 2016/01/07 17:55:55 bouyer Exp $ - -patch for CVE-2015-8550 aka XSA-155 from -http://xenbits.xenproject.org/xsa/xsa155-xen-0001-xen-Add-RING_COPY_REQUEST.patch -http://xenbits.xenproject.org/xsa/xsa155-xen-0002-blktap2-Use-RING_COPY_REQUEST.patch -http://xenbits.xenproject.org/xsa/xsa155-qemut-qdisk-double-access.patch -http://xenbits.xenproject.org/xsa/xsa155-qemut-xenfb.patch - ---- ../xen/include/public/io/ring.h.orig -+++ ../xen/include/public/io/ring.h -@@ -212,6 +212,20 @@ typedef struct __name##_back_ring __name##_back_ring_t - #define RING_GET_REQUEST(_r, _idx) \ - (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].req)) - -+/* -+ * Get a local copy of a request. -+ * -+ * Use this in preference to RING_GET_REQUEST() so all processing is -+ * done on a local copy that cannot be modified by the other end. -+ * -+ * Note that https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58145 may cause this -+ * to be ineffective where _req is a struct which consists of only bitfields. -+ */ -+#define RING_COPY_REQUEST(_r, _idx, _req) do { \ -+ /* Use volatile to force the copy into _req. */ \ -+ *(_req) = *(volatile typeof(_req))RING_GET_REQUEST(_r, _idx); \ -+} while (0) -+ - #define RING_GET_RESPONSE(_r, _idx) \ - (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].rsp)) - ---- blktap2/drivers/block-log.c.orig -+++ blktap2/drivers/block-log.c -@@ -494,11 +494,12 @@ static int ctl_kick(struct tdlog_state* s, int fd) - reqstart = s->bring.req_cons; - reqend = s->sring->req_prod; - -+ xen_mb(); - BDPRINTF("ctl: ring kicked (start = %u, end = %u)", reqstart, reqend); - - while (reqstart != reqend) { - /* XXX actually submit these! */ -- memcpy(&req, RING_GET_REQUEST(&s->bring, reqstart), sizeof(req)); -+ RING_COPY_REQUEST(&s->bring, reqstart, &req); - BDPRINTF("ctl: read request %"PRIu64":%u", req.sector, req.count); - s->bring.req_cons = ++reqstart; - ---- blktap2/drivers/tapdisk-vbd.c.orig -+++ blktap2/drivers/tapdisk-vbd.c -@@ -1555,7 +1555,7 @@ tapdisk_vbd_pull_ring_requests(td_vbd_t *vbd) - int idx; - RING_IDX rp, rc; - td_ring_t *ring; -- blkif_request_t *req; -+ blkif_request_t req; - td_vbd_request_t *vreq; - - ring = &vbd->ring; -@@ -1566,16 +1566,16 @@ tapdisk_vbd_pull_ring_requests(td_vbd_t *vbd) - xen_rmb(); - - for (rc = ring->fe_ring.req_cons; rc != rp; rc++) { -- req = RING_GET_REQUEST(&ring->fe_ring, rc); -+ RING_COPY_REQUEST(&ring->fe_ring, rc, &req); - ++ring->fe_ring.req_cons; - -- idx = req->id; -+ idx = req.id; - vreq = &vbd->request_list[idx]; - - ASSERT(list_empty(&vreq->next)); - ASSERT(vreq->secs_pending == 0); - -- memcpy(&vreq->req, req, sizeof(blkif_request_t)); -+ memcpy(&vreq->req, &req, sizeof(blkif_request_t)); - vbd->received++; - vreq->vbd = vbd; - ---- ioemu-qemu-xen/hw/xen_blkif.h.orig -+++ ioemu-qemu-xen/hw/xen_blkif.h -@@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque - dst->handle = src->handle; - dst->id = src->id; - dst->sector_number = src->sector_number; -- if (n > src->nr_segments) -- n = src->nr_segments; -+ /* prevent the compiler from optimizing the code and using src->nr_segments instead */ -+ xen_mb(); -+ if (n > dst->nr_segments) -+ n = dst->nr_segments; - for (i = 0; i < n; i++) - dst->seg[i] = src->seg[i]; - } -@@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque - dst->handle = src->handle; - dst->id = src->id; - dst->sector_number = src->sector_number; -- if (n > src->nr_segments) -- n = src->nr_segments; -+ /* prevent the compiler from optimizing the code and using src->nr_segments instead */ -+ xen_mb(); -+ if (n > dst->nr_segments) -+ n = dst->nr_segments; - for (i = 0; i < n; i++) - dst->seg[i] = src->seg[i]; - } - ---- ioemu-qemu-xen/hw/xenfb.c -+++ ioemu-qemu-xen/hw/xenfb.c -@@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) - - static void xenfb_handle_events(struct XenFB *xenfb) - { -- uint32_t prod, cons; -+ uint32_t prod, cons, out_cons; - struct xenfb_page *page = xenfb->c.page; - - prod = page->out_prod; -- if (prod == page->out_cons) -+ out_cons = page->out_cons; -+ if (prod == out_cons) - return; - xen_rmb(); /* ensure we see ring contents up to prod */ -- for (cons = page->out_cons; cons != prod; cons++) { -+ for (cons = out_cons; cons != prod; cons++) { - union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); -+ uint8_t type = event->type; - int x, y, w, h; - -- switch (event->type) { -+ switch (type) { - case XENFB_TYPE_UPDATE: - if (xenfb->up_count == UP_QUEUE) - xenfb->up_fullscreen = 1; diff --git a/sysutils/xentools41/patches/patch-CVE-2015-8554 b/sysutils/xentools41/patches/patch-CVE-2015-8554 deleted file mode 100644 index 9516e638960..00000000000 --- a/sysutils/xentools41/patches/patch-CVE-2015-8554 +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-CVE-2015-8554,v 1.1 2016/01/07 17:55:55 bouyer Exp $ - -patch for CVE-2015-8554 aka XSA-164 from -http://xenbits.xenproject.org/xsa/xsa164.patch - ---- ioemu-qemu-xen/hw/pt-msi.c.orig -+++ ioemu-qemu-xen/hw/pt-msi.c -@@ -440,6 +440,13 @@ static void pci_msix_writel(void *opaque - return; - } - -+ if ( addr - msix->mmio_base_addr >= msix->total_entries * 16 ) -+ { -+ PT_LOG("Error: Out of bounds write to MSI-X table," -+ " addr %016"PRIx64"\n", addr); -+ return; -+ } -+ - entry_nr = (addr - msix->mmio_base_addr) / 16; - entry = &msix->msix_entry[entry_nr]; - offset = ((addr - msix->mmio_base_addr) % 16) / 4; diff --git a/sysutils/xentools41/patches/patch-XSA-197 b/sysutils/xentools41/patches/patch-XSA-197 deleted file mode 100644 index b875273c39e..00000000000 --- a/sysutils/xentools41/patches/patch-XSA-197 +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-XSA-197,v 1.1 2016/11/22 20:53:40 bouyer Exp $ - -Backported from: - -From: Jan Beulich <jbeulich@suse.com> -Subject: xen: fix ioreq handling - -Avoid double fetches and bounds check size to avoid overflowing -internal variables. - -This is XSA-197. - -Reported-by: yanghongke <yanghongke@huawei.com> -Signed-off-by: Jan Beulich <jbeulich@suse.com> -Reviewed-by: Ian Jackson <ian.jackson@eu.citrix.com> - ---- ioemu-qemu-xen/i386-dm/helper2.c.orig 2013-07-17 12:59:40.000000000 +0200 -+++ ioemu-qemu-xen/i386-dm/helper2.c 2016-11-22 16:15:32.000000000 +0100 -@@ -333,6 +333,11 @@ - - sign = req->df ? -1 : 1; - -+ if (req->size > sizeof(unsigned long)) { -+ fprintf(stderr, "PIO: bad size (%u)\n", req->size); -+ exit(-1); -+ } -+ - if (req->dir == IOREQ_READ) { - if (!req->data_is_ptr) { - req->data = do_inp(env, req->addr, req->size); -@@ -368,6 +373,11 @@ - - sign = req->df ? -1 : 1; - -+ if (req->size > sizeof(req->data)) { -+ fprintf(stderr, "MMIO: bad size (%u)\n", req->size); -+ exit(-1); -+ } -+ - if (!req->data_is_ptr) { - if (req->dir == IOREQ_READ) { - for (i = 0; i < req->count; i++) { -@@ -481,11 +491,13 @@ - req.df = 1; - req.type = buf_req->type; - req.data_is_ptr = 0; -+ xen_rmb(); - qw = (req.size == 8); - if (qw) { - buf_req = &buffered_io_page->buf_ioreq[ - (buffered_io_page->read_pointer+1) % IOREQ_BUFFER_SLOT_NUM]; - req.data |= ((uint64_t)buf_req->data) << 32; -+ xen_rmb(); - } - - __handle_ioreq(env, &req); -@@ -512,7 +524,11 @@ - - __handle_buffered_iopage(env); - if (req) { -- __handle_ioreq(env, req); -+ ioreq_t copy = *req; -+ -+ xen_rmb(); -+ __handle_ioreq(env, ©); -+ req->data = copy.data; - - if (req->state != STATE_IOREQ_INPROCESS) { - fprintf(logfile, "Badness in I/O request ... not in service?!: " diff --git a/sysutils/xentools41/patches/patch-XSA-198 b/sysutils/xentools41/patches/patch-XSA-198 deleted file mode 100644 index 29bb8cdaa79..00000000000 --- a/sysutils/xentools41/patches/patch-XSA-198 +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-XSA-198,v 1.1 2016/11/22 20:53:40 bouyer Exp $ - -Backported from: - -From 71a389ae940bc52bf897a6e5becd73fd8ede94c5 Mon Sep 17 00:00:00 2001 -From: Ian Jackson <ian.jackson@eu.citrix.com> -Date: Thu, 3 Nov 2016 16:37:40 +0000 -Subject: [PATCH] pygrub: Properly quote results, when returning them to the - caller: - -* When the caller wants sexpr output, use `repr()' - This is what Xend expects. - - The returned S-expressions are now escaped and quoted by Python, - generally using '...'. Previously kernel and ramdisk were unquoted - and args was quoted with "..." but without proper escaping. This - change may break toolstacks which do not properly dequote the - returned S-expressions. - -* When the caller wants "simple" output, crash if the delimiter is - contained in the returned value. - - With --output-format=simple it does not seem like this could ever - happen, because the bootloader config parsers all take line-based - input from the various bootloader config files. - - With --output-format=simple0, this can happen if the bootloader - config file contains nul bytes. - -This is XSA-198. - -Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> -Tested-by: Ian Jackson <Ian.Jackson@eu.citrix.com> -Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> - ---- pygrub/src/pygrub.orig 2013-09-10 08:42:18.000000000 +0200 -+++ pygrub/src/pygrub 2016-11-22 16:26:10.000000000 +0100 -@@ -653,14 +653,17 @@ - return cfg - - def format_sxp(kernel, ramdisk, args): -- s = "linux (kernel %s)" % kernel -+ s = "linux (kernel %s)" % repr(kernel) - if ramdisk: -- s += "(ramdisk %s)" % ramdisk -+ s += "(ramdisk %s)" % repr(ramdisk) - if args: -- s += "(args \"%s\")" % args -+ s += "(args %s)" % repr(args) - return s - - def format_simple(kernel, ramdisk, args, sep): -+ for check in (kernel, ramdisk, args): -+ if check is not None and sep in check: -+ raise RuntimeError, "simple format cannot represent delimiter-containing value" - s = ("kernel %s" % kernel) + sep - if ramdisk: - s += ("ramdisk %s" % ramdisk) + sep diff --git a/sysutils/xentools41/patches/patch-XSA-199 b/sysutils/xentools41/patches/patch-XSA-199 deleted file mode 100644 index af551486fd5..00000000000 --- a/sysutils/xentools41/patches/patch-XSA-199 +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-XSA-199,v 1.1 2016/12/20 10:22:29 bouyer Exp $ - -From b73bd1edc05d1bad5c018228146930d79315a5da Mon Sep 17 00:00:00 2001 -From: Ian Jackson <ian.jackson@eu.citrix.com> -Date: Mon, 14 Nov 2016 17:19:46 +0000 -Subject: [PATCH] qemu: ioport_read, ioport_write: be defensive about 32-bit - addresses - -On x86, ioport addresses are 16-bit. That these functions take 32-bit -arguments is a mistake. Changing the argument type to 16-bit will -discard the top bits of any erroneous values from elsewhere in qemu. - -Also, check just before use that the value is in range. (This turns -an ill-advised change to MAX_IOPORTS into a possible guest crash -rather than a privilege escalation vulnerability.) - -And, in the Xen ioreq processor, clamp incoming ioport addresses to -16-bit values. Xen will never write >16-bit values but the guest may -have access to the ioreq ring. We want to defend the rest of the qemu -code from wrong values. - -This is XSA-199. - -Reported-by: yanghongke <yanghongke@huawei.com> -Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> ---- - i386-dm/helper2.c | 2 ++ - vl.c | 9 +++++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c -index 2706f2e..5d276bb 100644 ---- ioemu-qemu-xen/i386-dm/helper2.c.orig -+++ ioemu-qemu-xen/i386-dm/helper2.c -@@ -375,6 +375,8 @@ static void cpu_ioreq_pio(CPUState *env, ioreq_t *req) - - sign = req->df ? -1 : 1; - -+ req->addr &= 0x0ffffU; -+ - if (req->size > sizeof(req->data)) { - fprintf(stderr, "MMIO: bad size (%u)\n", req->size); - exit(-1); -diff --git a/vl.c b/vl.c -index f9c4d7e..c3c5d63 100644 ---- ioemu-qemu-xen/vl.c.orig -+++ ioemu-qemu-xen/vl.c -@@ -52,6 +52,7 @@ - - #include <xen/hvm/hvm_info_table.h> - -+#include <assert.h> - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> -@@ -290,26 +291,30 @@ PicState2 *isa_pic; - static IOPortReadFunc default_ioport_readb, default_ioport_readw, default_ioport_readl; - static IOPortWriteFunc default_ioport_writeb, default_ioport_writew, default_ioport_writel; - --static uint32_t ioport_read(int index, uint32_t address) -+static uint32_t ioport_read(int index, uint16_t address) - { - static IOPortReadFunc *default_func[3] = { - default_ioport_readb, - default_ioport_readw, - default_ioport_readl - }; -+ if (address >= MAX_IOPORTS) -+ abort(); - IOPortReadFunc *func = ioport_read_table[index][address]; - if (!func) - func = default_func[index]; - return func(ioport_opaque[address], address); - } - --static void ioport_write(int index, uint32_t address, uint32_t data) -+static void ioport_write(int index, uint16_t address, uint32_t data) - { - static IOPortWriteFunc *default_func[3] = { - default_ioport_writeb, - default_ioport_writew, - default_ioport_writel - }; -+ if (address >= MAX_IOPORTS) -+ abort(); - IOPortWriteFunc *func = ioport_write_table[index][address]; - if (!func) - func = default_func[index]; --- -2.1.4 diff --git a/sysutils/xentools41/patches/patch-aa b/sysutils/xentools41/patches/patch-aa deleted file mode 100644 index 3e9d07e5285..00000000000 --- a/sysutils/xentools41/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2011/05/07 18:39:06 tnn Exp $ - ---- xentrace/Makefile.orig 2010-04-07 16:12:05.000000000 +0000 -+++ xentrace/Makefile -@@ -43,6 +43,7 @@ install: build - [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) - $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) -+ $(INSTALL_DATA) formats $(DESTDIR)$(EGDIR) - - .PHONY: clean - clean: diff --git a/sysutils/xentools41/patches/patch-ab b/sysutils/xentools41/patches/patch-ab deleted file mode 100644 index f63bdd234eb..00000000000 --- a/sysutils/xentools41/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- blktap/drivers/Makefile.orig 2008-08-01 16:38:07.000000000 +0200 -+++ blktap/drivers/Makefile -@@ -37,9 +37,11 @@ BLK-OBJS-y += block-qcow2.o - BLK-OBJS-y += aes.o - BLK-OBJS-y += tapaio.o - BLK-OBJS-$(CONFIG_Linux) += blk_linux.o -+BLK-OBJS-$(CONFIG_NetBSD) += blk_netbsd.o - - BLKTAB-OBJS-y := blktapctrl.o - BLKTAB-OBJS-$(CONFIG_Linux) += blktapctrl_linux.o -+BLKTAB-OBJS-$(CONFIG_NetBSD) += blktapctrl_netbsd.o - - all: $(IBIN) qcow-util - diff --git a/sysutils/xentools41/patches/patch-ac b/sysutils/xentools41/patches/patch-ac deleted file mode 100644 index 1db6996f612..00000000000 --- a/sysutils/xentools41/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- libfsimage/common/Makefile.orig 2010-05-11 21:27:58.000000000 +0000 -+++ libfsimage/common/Makefile -@@ -4,6 +4,8 @@ include $(XEN_ROOT)/tools/Rules.mk - MAJOR = 1.0 - MINOR = 0 - -+CFLAGS += -DFSIMAGE_FSDIR=\"$(LIBDIR)/fs\" -+ - LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS - LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU - LDFLAGS = $(LDFLAGS-y) diff --git a/sysutils/xentools41/patches/patch-ad b/sysutils/xentools41/patches/patch-ad deleted file mode 100644 index ed4b844728a..00000000000 --- a/sysutils/xentools41/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- examples/xend-config.sxp.orig 2010-04-07 16:12:04.000000000 +0000 -+++ examples/xend-config.sxp -@@ -190,7 +190,7 @@ - - # Whether to enable auto-ballooning of dom0 to allow domUs to be created. - # If enable-dom0-ballooning = no, dom0 will never balloon out. --(enable-dom0-ballooning yes) -+(enable-dom0-ballooning no) - - # 32-bit paravirtual domains can only consume physical - # memory below 168GB. On systems with memory beyond that address, diff --git a/sysutils/xentools41/patches/patch-ae b/sysutils/xentools41/patches/patch-ae deleted file mode 100644 index 7d7080a3421..00000000000 --- a/sysutils/xentools41/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2011/12/14 04:01:37 sbd Exp $ - ---- Makefile.orig 2011-10-20 17:05:41.000000000 +0000 -+++ Makefile -@@ -24,7 +24,8 @@ SUBDIRS-$(CONFIG_Linux) += memshr - SUBDIRS-$(CONFIG_Linux) += blktap - SUBDIRS-$(CONFIG_Linux) += blktap2 - SUBDIRS-$(CONFIG_NetBSD) += libaio --SUBDIRS-$(CONFIG_NetBSD) += blktap2 -+SUBDIRS-$(CONFIG_NetBSD) += blktap -+#SUBDIRS-$(CONFIG_NetBSD) += blktap2 - SUBDIRS-$(CONFIG_NetBSD) += xenbackendd - SUBDIRS-y += libfsimage - SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen diff --git a/sysutils/xentools41/patches/patch-af b/sysutils/xentools41/patches/patch-af deleted file mode 100644 index 88ea8591c18..00000000000 --- a/sysutils/xentools41/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- firmware/etherboot/Makefile.orig 2011-03-25 10:42:50.000000000 +0000 -+++ firmware/etherboot/Makefile -@@ -34,18 +34,10 @@ eb-roms.h: Config - $(MAKE) NO_WERROR=1 $@.new - mv -f $@.new $@ - --$T: -- if ! wget -O _$T $(IPXE_TARBALL_URL); then \ -- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ -- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ -- $(IPXE_GIT_TAG) | gzip >../_$T); \ -- rm -rf $D.git; \ -- fi -- mv _$T $T -+$D: -+ ln -sf $(WRKSRC)/../../ipxe $D - --$D/src/arch/i386/Makefile: $T Config -- rm -rf $D -- gzip -dc $T | tar xf - -+$D/src/arch/i386/Makefile: $D Config - for i in $$(cat patches/series) ; do \ - patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \ - done diff --git a/sysutils/xentools41/patches/patch-ag b/sysutils/xentools41/patches/patch-ag deleted file mode 100644 index 731699e3b93..00000000000 --- a/sysutils/xentools41/patches/patch-ag +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2011/04/15 10:32:22 bouyer Exp $ - ---- ../config/NetBSD.mk.orig 2011-03-25 11:42:47.000000000 +0100 -+++ ../config/NetBSD.mk 2011-04-15 11:36:19.000000000 +0200 -@@ -7,12 +7,13 @@ - LIBEXEC = $(PREFIX)/libexec - PRIVATE_BINDIR = $(BINDIR) - -+MANDIR = $(PREFIX)/man -+MAN1DIR = $(MANDIR)/man1 -+MAN8DIR = $(MANDIR)/man8 -+ - DLOPEN_LIBS = - --ifeq ($(PREFIX),/usr) --XEN_LOCK_DIR = /var/lib --else --XEN_LOCK_DIR = $(PREFIX)/var/lib --endif -+XEN_LOCK_DIR = $(VARBASE)/run -+XEN_EXAMPLES_DIR=$(PREFIX)/share/examples/xen - - WGET = ftp diff --git a/sysutils/xentools41/patches/patch-ah b/sysutils/xentools41/patches/patch-ah deleted file mode 100644 index 84b0d927fe0..00000000000 --- a/sysutils/xentools41/patches/patch-ah +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2011/04/15 10:32:22 bouyer Exp $ - ---- hotplug/NetBSD/Makefile.orig 2011-03-25 11:42:50.000000000 +0100 -+++ hotplug/NetBSD/Makefile 2011-04-15 11:38:32.000000000 +0200 -@@ -8,7 +8,7 @@ - XEN_SCRIPTS += vif-ip - - XEN_SCRIPT_DATA = --XEN_RCD_PROG = rc.d/xencommons rc.d/xend rc.d/xendomains rc.d/xen-watchdog -+#XEN_RCD_PROG = rc.d/xencommons rc.d/xend rc.d/xendomains rc.d/xen-watchdog - - .PHONY: all - all: -@@ -21,10 +21,11 @@ - - .PHONY: install-scripts - install-scripts: -- $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) -+ $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR) -+ $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts - set -e; for i in $(XEN_SCRIPTS); \ - do \ -- $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ -+ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts; \ - done - set -e; for i in $(XEN_SCRIPT_DATA); \ - do \ -@@ -33,12 +34,6 @@ - - .PHONY: install-rcd - install-rcd: -- $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/rc.d -- set -e; for i in $(XEN_RCD_PROG); \ -- do \ -- $(INSTALL_PROG) $$i $(DESTDIR)$(CONFIG_DIR)/rc.d; \ -- done -- $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(CONFIG_DIR)/rc.d/xen-hotplugpath.sh - - .PHONY: clean - clean: diff --git a/sysutils/xentools41/patches/patch-ai b/sysutils/xentools41/patches/patch-ai deleted file mode 100644 index 1a9cad03681..00000000000 --- a/sysutils/xentools41/patches/patch-ai +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- python/xen/xend/osdep.py.orig 2011-04-01 12:03:13.000000000 +0200 -+++ python/xen/xend/osdep.py 2011-04-01 13:49:45.000000000 +0200 -@@ -94,8 +94,12 @@ - return None - cmd = "/sbin/sysctl " + cmdarg - sysctloutput = commands.getoutput(cmd) -+ div = 1 -+ if label == 'current' and '=' not in sysctloutput: -+ sysctloutput = commands.getoutput( "/sbin/sysctl hw.physmem64") -+ div = 1024 - (name, value) = sysctloutput.split('=') -- return int(value) -+ return int(value) / div - - def _solaris_balloon_stat(label): - """Returns the value for the named label, or None if an error occurs.""" diff --git a/sysutils/xentools41/patches/patch-aj b/sysutils/xentools41/patches/patch-aj deleted file mode 100644 index f2e93e65bf9..00000000000 --- a/sysutils/xentools41/patches/patch-aj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- hotplug/NetBSD/vif-bridge.orig 2011-03-25 11:42:50.000000000 +0100 -+++ hotplug/NetBSD/vif-bridge 2011-04-01 14:55:58.000000000 +0200 -@@ -23,7 +23,10 @@ - xbridge=$(xenstore-read "$xpath/bridge") - xfid=$(xenstore-read "$xpath/frontend-id") - xhandle=$(xenstore-read "$xpath/handle") -- iface=$(xenstore-read "$xpath/vifname") -+ iface=$(xenstore-read "$xpath/vifname") || true -+ if [ x${iface} = "x" ] ; then -+ iface=xvif$xfid.$xhandle -+ fi - echo ifconfig $iface up - ifconfig $iface up - brconfig $xbridge add $iface diff --git a/sysutils/xentools41/patches/patch-ak b/sysutils/xentools41/patches/patch-ak deleted file mode 100644 index ccb48792e91..00000000000 --- a/sysutils/xentools41/patches/patch-ak +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2011/04/15 13:35:05 bouyer Exp $ - ---- hotplug/NetBSD/vif-ip.orig 2011-04-01 16:04:24.000000000 +0200 -+++ hotplug/NetBSD/vif-ip 2011-04-01 16:04:54.000000000 +0200 -@@ -23,7 +23,10 @@ - xip=$(xenstore-read "$xpath/ip") - xfid=$(xenstore-read "$xpath/frontend-id") - xhandle=$(xenstore-read "$xpath/handle") -- iface=$(xenstore-read "$xpath/vifname") -+ iface=$(xenstore-read "$xpath/vifname") || true -+ if [ x${iface} = "x" ] ; then -+ iface=xvif$xfid.$xhandle -+ fi - echo ifconfig $iface $xip up - ifconfig $iface $xip up - xenstore-write $xpath/hotplug-status connected diff --git a/sysutils/xentools41/patches/patch-al b/sysutils/xentools41/patches/patch-al deleted file mode 100644 index 88936f1e595..00000000000 --- a/sysutils/xentools41/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.1 2011/04/15 10:32:22 bouyer Exp $ - ---- ioemu-qemu-xen/i386-dm/hookstarget.mak.orig 2011-04-15 11:45:21.000000000 +0200 -+++ ioemu-qemu-xen/i386-dm/hookstarget.mak 2011-04-15 11:46:36.000000000 +0200 -@@ -2,5 +2,5 @@ - - install-hook: - $(INSTALL_DIR) "$(DESTDIR)/$(bindir)" -- $(INSTALL_DIR) "$(DESTDIR)/$(configdir)" -- $(INSTALL_PROG) $(QEMU_ROOT)/i386-dm/qemu-ifup-$(IOEMU_OS) "$(DESTDIR)/$(configdir)/qemu-ifup" -+ $(INSTALL_DIR) "$(DESTDIR)/$(XEN_EXAMPLES_DIR)/scripts" -+ $(INSTALL_PROG) $(QEMU_ROOT)/i386-dm/qemu-ifup-$(IOEMU_OS) "$(DESTDIR)/$(XEN_EXAMPLES_DIR)/scripts/qemu-ifup" diff --git a/sysutils/xentools41/patches/patch-am b/sysutils/xentools41/patches/patch-am deleted file mode 100644 index 238db793030..00000000000 --- a/sysutils/xentools41/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2013/11/29 19:31:47 drochner Exp $ - ---- libxc/xc_dom.h.orig 2013-11-29 18:20:47.000000000 +0000 -+++ libxc/xc_dom.h 2013-11-29 18:22:14.000000000 +0000 -@@ -303,7 +303,7 @@ static inline void *xc_dom_vaddr_to_ptr( - if ( ptr == NULL ) - return ptr; - *safe_region_out = (safe_region_count << XC_DOM_PAGE_SHIFT(dom)) - offset; -- return ptr; -+ return ptr + offset; - } - - static inline int xc_dom_feature_translated(struct xc_dom_image *dom) diff --git a/sysutils/xentools41/patches/patch-ba b/sysutils/xentools41/patches/patch-ba deleted file mode 100644 index 1bcb19b9830..00000000000 --- a/sysutils/xentools41/patches/patch-ba +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- python/xen/xend/XendNode.py.orig 2010-04-07 16:12:05.000000000 +0000 -+++ python/xen/xend/XendNode.py -@@ -276,28 +276,29 @@ class XendNode: - except KeyError: - pass - -- for pci_dev in PciUtil.get_all_pci_devices(): -- ppci_record = { -- 'domain': pci_dev.domain, -- 'bus': pci_dev.bus, -- 'slot': pci_dev.slot, -- 'func': pci_dev.func, -- 'vendor_id': pci_dev.vendor, -- 'vendor_name': pci_dev.vendorname, -- 'device_id': pci_dev.device, -- 'device_name': pci_dev.devicename, -- 'revision_id': pci_dev.revision, -- 'class_code': pci_dev.classcode, -- 'class_name': pci_dev.classname, -- 'subsystem_vendor_id': pci_dev.subvendor, -- 'subsystem_vendor_name': pci_dev.subvendorname, -- 'subsystem_id': pci_dev.subdevice, -- 'subsystem_name': pci_dev.subdevicename, -- 'driver': pci_dev.driver -- } -- # If saved uuid exists, use it. Otherwise create one. -- ppci_uuid = saved_ppci_table.get(pci_dev.name, uuid.createString()) -- XendPPCI(ppci_uuid, ppci_record) -+ pass -+ #for pci_dev in PciUtil.get_all_pci_devices(): -+ # ppci_record = { -+ # 'domain': pci_dev.domain, -+ # 'bus': pci_dev.bus, -+ # 'slot': pci_dev.slot, -+ # 'func': pci_dev.func, -+ # 'vendor_id': pci_dev.vendor, -+ # 'vendor_name': pci_dev.vendorname, -+ # 'device_id': pci_dev.device, -+ # 'device_name': pci_dev.devicename, -+ # 'revision_id': pci_dev.revision, -+ # 'class_code': pci_dev.classcode, -+ # 'class_name': pci_dev.classname, -+ # 'subsystem_vendor_id': pci_dev.subvendor, -+ # 'subsystem_vendor_name': pci_dev.subvendorname, -+ # 'subsystem_id': pci_dev.subdevice, -+ # 'subsystem_name': pci_dev.subdevicename, -+ # 'driver': pci_dev.driver -+ # } -+ # # If saved uuid exists, use it. Otherwise create one. -+ # ppci_uuid = saved_ppci_table.get(pci_dev.name, uuid.createString()) -+ # XendPPCI(ppci_uuid, ppci_record) - - def _init_PSCSIs(self): - # Initialise PSCSIs and PSCSI_HBAs diff --git a/sysutils/xentools41/patches/patch-bb b/sysutils/xentools41/patches/patch-bb deleted file mode 100644 index eeaf66e2964..00000000000 --- a/sysutils/xentools41/patches/patch-bb +++ /dev/null @@ -1,213 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- libxc/xc_netbsd.c.orig 2011-03-29 17:09:58.000000000 +0000 -+++ libxc/xc_netbsd.c -@@ -21,6 +21,7 @@ - #include "xc_private.h" - - #include <xen/sys/evtchn.h> -+#include <xen/sys/gntdev.h> - #include <unistd.h> - #include <fcntl.h> - -@@ -351,7 +352,189 @@ void discard_file_cache(xc_interface *xc - errno = saved_errno; - } - --static struct xc_osdep_ops *netbsd_osdep_init(xc_interface *xch, enum xc_osdep_type type) -+#define DEVXEN "/dev/xen/" -+ -+static xc_osdep_handle -+netbsd_gnttab_open(xc_gnttab *xcg) -+{ -+ int fd; -+ -+ fd = open(DEVXEN "gntdev", O_RDWR); -+ if (fd == -1) -+ return XC_OSDEP_OPEN_ERROR; -+ -+ return (xc_osdep_handle)fd; -+} -+ -+static int -+netbsd_gnttab_close(xc_gnttab *xcg, xc_osdep_handle h) -+{ -+ int fd = (int)h; -+ return close(fd); -+} -+ -+static void * -+netbsd_gnttab_map_grant_ref(xc_gnttab *xch, xc_osdep_handle h, -+ uint32_t domid, uint32_t ref, int prot) -+{ -+ int fd = (int)h; -+ struct ioctl_gntdev_map_grant_ref map; -+ void *addr; -+ -+ map.count = 1; -+ map.refs[0].domid = domid; -+ map.refs[0].ref = ref; -+ -+ if ( ioctl(fd, IOCTL_GNTDEV_MAP_GRANT_REF, &map) ) { -+ PERROR("netbsd_gnttab_map_grant_ref: ioctl MAP_GRANT_REF failed"); -+ return NULL; -+ } -+ -+mmap_again: -+ addr = mmap(NULL, XC_PAGE_SIZE, prot, MAP_SHARED, fd, map.index); -+ if ( addr == MAP_FAILED ) -+ { -+ int saved_errno = errno; -+ struct ioctl_gntdev_unmap_grant_ref unmap_grant; -+ -+ if ( saved_errno == EAGAIN ) -+ { -+ usleep(1000); -+ goto mmap_again; -+ } -+ /* Unmap the driver slots used to store the grant information. */ -+ PERROR("netbsd_gnttab_map_grant_ref: mmap failed"); -+ unmap_grant.index = map.index; -+ unmap_grant.count = 1; -+ ioctl(fd, IOCTL_GNTDEV_UNMAP_GRANT_REF, &unmap_grant); -+ errno = saved_errno; -+ return NULL; -+ } -+ -+ return addr; -+} -+ -+static void * -+do_gnttab_map_grant_refs(xc_gnttab *xch, xc_osdep_handle h, -+ uint32_t count, uint32_t *domids, int domids_stride, -+ uint32_t *refs, int prot) -+{ -+ int fd = (int)h; -+ struct ioctl_gntdev_map_grant_ref *map; -+ void *addr = NULL; -+ int i; -+ -+ map = malloc(sizeof(*map) + -+ (count - 1) * sizeof(struct ioctl_gntdev_map_grant_ref)); -+ if ( map == NULL ) -+ return NULL; -+ -+ for ( i = 0; i < count; i++ ) -+ { -+ map->refs[i].domid = domids[i * domids_stride]; -+ map->refs[i].ref = refs[i]; -+ } -+ -+ map->count = count; -+ -+ if ( ioctl(fd, IOCTL_GNTDEV_MAP_GRANT_REF, map) ) { -+ PERROR("xc_gnttab_map_grant_refs: ioctl MAP_GRANT_REF failed"); -+ goto out; -+ } -+ -+ addr = mmap(NULL, XC_PAGE_SIZE * count, prot, MAP_SHARED, fd, -+ map->index); -+ if ( addr == MAP_FAILED ) -+ { -+ int saved_errno = errno; -+ struct ioctl_gntdev_unmap_grant_ref unmap_grant; -+ -+ /* Unmap the driver slots used to store the grant information. */ -+ PERROR("xc_gnttab_map_grant_refs: mmap failed"); -+ unmap_grant.index = map->index; -+ unmap_grant.count = count; -+ ioctl(fd, IOCTL_GNTDEV_UNMAP_GRANT_REF, &unmap_grant); -+ errno = saved_errno; -+ addr = NULL; -+ } -+ -+ out: -+ free(map); -+ -+ return addr; -+} -+ -+static void * -+netbsd_gnttab_map_grant_refs(xc_gnttab *xcg, xc_osdep_handle h, -+ uint32_t count, uint32_t *domids, uint32_t *refs, int prot) -+{ -+ return do_gnttab_map_grant_refs(xcg, h, count, domids, 1, refs, prot); -+} -+ -+static void * -+netbsd_gnttab_map_domain_grant_refs(xc_gnttab *xcg, xc_osdep_handle h, -+ uint32_t count, uint32_t domid, uint32_t *refs, int prot) -+{ -+ return do_gnttab_map_grant_refs(xcg, h, count, &domid, 0, refs, prot); -+} -+ -+static int -+netbsd_gnttab_munmap(xc_gnttab *xcg, xc_osdep_handle h, -+ void *start_address, uint32_t count) -+{ -+ int fd = (int)h; -+ struct ioctl_gntdev_get_offset_for_vaddr get_offset; -+ struct ioctl_gntdev_unmap_grant_ref unmap_grant; -+ int rc; -+ -+ if ( start_address == NULL ) -+ { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* First, it is necessary to get the offset which was initially used to -+ * mmap() the pages. -+ */ -+ get_offset.vaddr = (unsigned long)start_address; -+ rc = ioctl(fd, IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR, &get_offset); -+ if ( rc ) -+ return rc; -+ -+ if ( get_offset.count != count ) -+ { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* Next, unmap the memory. */ -+ rc = munmap(start_address, count * getpagesize()); -+ if ( rc ) -+ return rc; -+ -+ /* Finally, unmap the driver slots used to store the grant information. */ -+ unmap_grant.index = get_offset.offset; -+ unmap_grant.count = count; -+ rc = ioctl(fd, IOCTL_GNTDEV_UNMAP_GRANT_REF, &unmap_grant); -+ if ( rc ) -+ return rc; -+ return 0; -+} -+ -+static struct xc_osdep_ops netbsd_gnttab_ops = { -+ .open = &netbsd_gnttab_open, -+ .close = &netbsd_gnttab_close, -+ -+ .u.gnttab = { -+ .map_grant_ref = &netbsd_gnttab_map_grant_ref, -+ .map_grant_refs = &netbsd_gnttab_map_grant_refs, -+ .map_domain_grant_refs = &netbsd_gnttab_map_domain_grant_refs, -+ .munmap = &netbsd_gnttab_munmap, -+ }, -+}; -+ -+static struct xc_osdep_ops * -+netbsd_osdep_init(xc_interface *xch, enum xc_osdep_type type) - { - switch ( type ) - { -@@ -360,8 +543,7 @@ static struct xc_osdep_ops *netbsd_osdep - case XC_OSDEP_EVTCHN: - return &netbsd_evtchn_ops; - case XC_OSDEP_GNTTAB: -- ERROR("GNTTAB interface not supported on this platform"); -- return NULL; -+ return &netbsd_gnttab_ops; - default: - return NULL; - } diff --git a/sysutils/xentools41/patches/patch-bc b/sysutils/xentools41/patches/patch-bc deleted file mode 100644 index d082975117a..00000000000 --- a/sysutils/xentools41/patches/patch-bc +++ /dev/null @@ -1,110 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- include/xen-sys/NetBSD/gntdev.h.orig 2011-03-29 17:10:31.000000000 +0000 -+++ include/xen-sys/NetBSD/gntdev.h -@@ -0,0 +1,105 @@ -+/****************************************************************************** -+ * gntdev.h -+ * -+ * Interface to /dev/xen/gntdev. -+ * -+ * Copyright (c) 2007, D G Murray -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation; or, when 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_PUBLIC_GNTDEV_H__ -+#define __NetBSD_PUBLIC_GNTDEV_H__ -+ -+struct ioctl_gntdev_grant_ref { -+ /* The domain ID of the grant to be mapped. */ -+ uint32_t domid; -+ /* The grant reference of the grant to be mapped. */ -+ uint32_t ref; -+}; -+ -+/* -+ * Inserts the grant references into the mapping table of an instance -+ * of gntdev. N.B. This does not perform the mapping, which is deferred -+ * until mmap() is called with @index as the offset. -+ */ -+#define IOCTL_GNTDEV_MAP_GRANT_REF \ -+ _IOWR('G', 0, sizeof(struct ioctl_gntdev_map_grant_ref)) -+struct ioctl_gntdev_map_grant_ref { -+ /* IN parameters */ -+ /* The number of grants to be mapped. */ -+ uint32_t count; -+ uint32_t pad; -+ /* OUT parameters */ -+ /* The offset to be used on a subsequent call to mmap(). */ -+ uint64_t index; -+ /* Variable IN parameter. */ -+ /* Array of grant references, of size @count. */ -+ struct ioctl_gntdev_grant_ref refs[1]; -+}; -+ -+/* -+ * Removes the grant references from the mapping table of an instance of -+ * of gntdev. N.B. munmap() must be called on the relevant virtual address(es) -+ * before this ioctl is called, or an error will result. -+ */ -+#define IOCTL_GNTDEV_UNMAP_GRANT_REF \ -+ _IOW('G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref)) -+struct ioctl_gntdev_unmap_grant_ref { -+ /* IN parameters */ -+ /* The offset was returned by the corresponding map operation. */ -+ uint64_t index; -+ /* The number of pages to be unmapped. */ -+ uint32_t count; -+ uint32_t pad; -+}; -+ -+/* -+ * Returns the offset in the driver's address space that corresponds -+ * to @vaddr. This can be used to perform a munmap(), followed by an -+ * UNMAP_GRANT_REF ioctl, where no state about the offset is retained by -+ * the caller. The number of pages that were allocated at the same time as -+ * @vaddr is returned in @count. -+ * -+ * N.B. Where more than one page has been mapped into a contiguous range, the -+ * supplied @vaddr must correspond to the start of the range; otherwise -+ * an error will result. It is only possible to munmap() the entire -+ * contiguously-allocated range at once, and not any subrange thereof. -+ */ -+#define IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR \ -+ _IOWR('G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr)) -+struct ioctl_gntdev_get_offset_for_vaddr { -+ /* IN parameters */ -+ /* The virtual address of the first mapped page in a range. */ -+ uint64_t vaddr; -+ /* OUT parameters */ -+ /* The offset that was used in the initial mmap() operation. */ -+ uint64_t offset; -+ /* The number of pages mapped in the VM area that begins at @vaddr. */ -+ uint32_t count; -+ uint32_t pad; -+}; -+ -+#endif /* __NetBSD_PUBLIC_GNTDEV_H__ */ diff --git a/sysutils/xentools41/patches/patch-ca b/sysutils/xentools41/patches/patch-ca deleted file mode 100644 index 6e7a5fa665d..00000000000 --- a/sysutils/xentools41/patches/patch-ca +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ca,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- ../docs/man/xend-config.sxp.pod.5.orig 2010-04-07 16:12:04.000000000 +0000 -+++ ../docs/man/xend-config.sxp.pod.5 -@@ -4,7 +4,7 @@ xend-config.sxp - Xen daemon configurati - - =head1 SYNOPSIS - --/etc/xen/xend-config.sxp -+@XENDCONFDIR@/xend-config.sxp - - =head1 DESCRIPTION - -@@ -12,7 +12,7 @@ The xend(1) program requires xend-config - 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 @@ Defaults to I<1024>. - - =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 @@ domains should be saved when a crash occ - - 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>. - - =item I<device-create-timeout> - diff --git a/sysutils/xentools41/patches/patch-cb b/sysutils/xentools41/patches/patch-cb deleted file mode 100644 index 74aa5bd0068..00000000000 --- a/sysutils/xentools41/patches/patch-cb +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-cb,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- ../docs/man/xmdomain.cfg.pod.5.orig 2008-08-01 16:38:07.000000000 +0200 -+++ ../docs/man/xmdomain.cfg.pod.5 -@@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for - - =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 @@ The B<xm>(1) program uses python executa - 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/xentools41/patches/patch-cc b/sysutils/xentools41/patches/patch-cc deleted file mode 100644 index 33eb6446b57..00000000000 --- a/sysutils/xentools41/patches/patch-cc +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-cc,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- ../docs/man/xm.pod.1.orig 2009-01-05 11:26:58.000000000 +0000 -+++ ../docs/man/xm.pod.1 -@@ -75,7 +75,7 @@ in the config file. See L<xmdomain.cfg> - format, and possible options used in either the configfile or for I<vars>. - - I<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 -@@ -156,7 +156,7 @@ B<EXAMPLES> - - 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> -@@ -388,7 +388,7 @@ file format, and possible options used i - I<vars>. - - I<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@. - - The new subcommand will return without starting the domain. The - domain needs to be started using the B<xm start> command. -@@ -1068,7 +1068,7 @@ I<policy> is a dot-separated list of nam - 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. diff --git a/sysutils/xentools41/patches/patch-cd b/sysutils/xentools41/patches/patch-cd deleted file mode 100644 index 06a796a5936..00000000000 --- a/sysutils/xentools41/patches/patch-cd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cd,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- python/xen/xm/create.py.orig 2010-04-07 16:12:05.000000000 +0000 -+++ python/xen/xm/create.py -@@ -426,7 +426,7 @@ gopts.var('vtpm', val="instance=INSTANCE - 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/xentools41/patches/patch-ce b/sysutils/xentools41/patches/patch-ce deleted file mode 100644 index bd14472245e..00000000000 --- a/sysutils/xentools41/patches/patch-ce +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ce,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- security/policytools.txt.orig 2008-08-01 16:38:07.000000000 +0200 -+++ security/policytools.txt -@@ -16,10 +16,10 @@ XML. Read in the user manual about the n - name is used by the Xen management tools to identify existing - policies. Creating the security policy means creating a policy - description in XML: --/etc/xen/acm-security/policies/example/chwall_ste/test-security_policy.xml. -+@XENDCONFDIR@/acm-security/policies/example/chwall_ste/test-security_policy.xml. - - The policy XML description must follow the XML schema definition in --/etc/xen/acm-security/policies/security_policy.xsd. The policy tools -+@XENDCONFDIR@/acm-security/policies/security_policy.xsd. The policy tools - are written against this schema; they will create and refine policies - that conform to this scheme. - -@@ -144,5 +144,5 @@ policy file naming conventions based on - choose to use. - - To get a feel for the tool, you could use one of the example policy --definitions files from /etc/xen/acm-security/policies/example as -+definitions files from @XENDCONFDIR@/acm-security/policies/example as - input or a policy created by the xensec_ezpolicy tool. diff --git a/sysutils/xentools41/patches/patch-cf b/sysutils/xentools41/patches/patch-cf deleted file mode 100644 index b6129f6fdd1..00000000000 --- a/sysutils/xentools41/patches/patch-cf +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cf,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- xm-test/tests/security-acm/Makefile.am.orig 2008-08-01 16:38:07.000000000 +0200 -+++ xm-test/tests/security-acm/Makefile.am -@@ -19,10 +19,10 @@ TESTS_ENVIRONMENT=@TENV@ - %.test: %.py - cp $< $@ - chmod +x $@ -- @if [ -d /etc/xen/acm-security/policies ]; then \ -+ @if [ -d @XENDCONFDIR@/acm-security/policies ]; then \ - cp -f xm-test-security_policy.xml \ - xm-test-update-security_policy.xml\ -- /etc/xen/acm-security/policies; \ -+ @XENDCONFDIR@/acm-security/policies; \ - fi; - - clean-local: am_config_clean-local diff --git a/sysutils/xentools41/patches/patch-cg b/sysutils/xentools41/patches/patch-cg deleted file mode 100644 index 51a794c2f2f..00000000000 --- a/sysutils/xentools41/patches/patch-cg +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-cg,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- security/xensec_ezpolicy.orig 2008-08-01 16:38:07.000000000 +0200 -+++ security/xensec_ezpolicy -@@ -935,7 +935,7 @@ class ezFrame(wx.Frame): - policyname = transInfo() - if not policyname: - return -- path="/etc/xen/acm-security/policies/" -+ path="@XENDCONFDIR@/acm-security/policies/" - nameparts=string.split(policyname, ".") - if len(nameparts) > 1: - path = path + "/".join(nameparts[0:len(nameparts)-1]) -@@ -1592,7 +1592,7 @@ where you merely replace "NAME" - Save the policy under the name proposed by the tool in the proposed directory - if you are using this tool in your Xen environment. Otherwise, you need - to copy the resulting file into your Xen environment to the directory --"/etc/xen/acm-security/policies/example/chwall_ste/".<BR> -+"@XENDCONFDIR@/acm-security/policies/example/chwall_ste/".<BR> - <BR> - This tool creates policies for the Xen Chinese Wall and Simple Type Enforcement - policy. The Xen access control policy in general is more expressive and diff --git a/sysutils/xentools41/patches/patch-ch b/sysutils/xentools41/patches/patch-ch deleted file mode 100644 index 2649cd2da10..00000000000 --- a/sysutils/xentools41/patches/patch-ch +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ch,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- xm-test/runtest.sh.orig 2008-08-01 16:38:07.000000000 +0200 -+++ xm-test/runtest.sh -@@ -220,9 +220,9 @@ unsafe=no - GROUPENTERED=default - - #Prepare for usage with ACM --if [ -d /etc/xen/acm-security/policies ]; then -+if [ -d @XENDCONFDIR@/acm-security/policies ]; then - cp -f tests/security-acm/xm-test-security_policy.xml \ -- /etc/xen/acm-security/policies -+ @XENDCONFDIR@/acm-security/policies - fi - - unset XM_MANAGED_DOMAINS diff --git a/sysutils/xentools41/patches/patch-config_StdGNU.mk b/sysutils/xentools41/patches/patch-config_StdGNU.mk deleted file mode 100644 index dbf1058da80..00000000000 --- a/sysutils/xentools41/patches/patch-config_StdGNU.mk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-config_StdGNU.mk,v 1.1 2012/05/10 16:07:36 abs Exp $ - -Allow XEN_CONFIG_DIR to be overriden in the environment - ---- ../config/StdGNU.mk.orig 2012-05-10 15:51:14.000000000 +0000 -+++ ../config/StdGNU.mk -@@ -53,7 +53,7 @@ endif - - SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR) - --XEN_CONFIG_DIR = $(CONFIG_DIR)/xen -+XEN_CONFIG_DIR ?= $(CONFIG_DIR)/xen - XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts - - SOCKET_LIBS = diff --git a/sysutils/xentools41/patches/patch-da b/sysutils/xentools41/patches/patch-da deleted file mode 100644 index 99881b60cf5..00000000000 --- a/sysutils/xentools41/patches/patch-da +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-da,v 1.3 2014/08/28 14:30:03 bouyer Exp $ - ---- ioemu-qemu-xen/configure.orig 2013-07-17 12:59:40.000000000 +0200 -+++ ioemu-qemu-xen/configure 2014-08-28 13:59:55.000000000 +0200 -@@ -1089,7 +1089,7 @@ - # Check if tools are available to build documentation. - if [ -x "`which texi2html 2>/dev/null`" ] && \ - [ -x "`which pod2man 2>/dev/null`" ]; then -- build_docs="yes" -+# build_docs="yes" - fi - - ########################################## -@@ -1124,7 +1124,7 @@ - if test -z "$prefix" ; then - prefix="/usr/local" - fi -- mansuffix="/share/man" -+ mansuffix="/man" - datasuffix="/share/qemu" - docsuffix="/share/doc/qemu" - binsuffix="/bin" -@@ -1215,6 +1215,9 @@ - echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h - echo "MAKE=$make" >> $config_mak - echo "INSTALL=$install" >> $config_mak -+echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak -+echo "INSTALL_DATA=$install -d -m0644 -p" >> $config_mak -+echo "INSTALL_PROG=$install -d -m0755 -p" >> $config_mak - echo "CC=$cc" >> $config_mak - echo "HOST_CC=$host_cc" >> $config_mak - echo "AR=$ar" >> $config_mak -@@ -1492,7 +1495,9 @@ - # XXX: suppress that - if [ "$bsd" = "yes" ] ; then - echo "#define O_LARGEFILE 0" >> $config_h -+ echo "#ifndef MAP_ANONYMOUS" >> $config_h - echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h -+ echo "#endif" >> $config_h - echo "#define _BSD 1" >> $config_h - fi - diff --git a/sysutils/xentools41/patches/patch-db b/sysutils/xentools41/patches/patch-db deleted file mode 100644 index 0f14778103f..00000000000 --- a/sysutils/xentools41/patches/patch-db +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-db,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - ---- ioemu-qemu-xen/Makefile.orig 2011-02-11 17:54:51.000000000 +0000 -+++ ioemu-qemu-xen/Makefile -@@ -1,7 +1,7 @@ - # Makefile for QEMU. - --include config-host.mak --include $(SRC_PATH)/rules.mak -+-include config-host.mak -+-include $(SRC_PATH)/rules.mak - - .PHONY: all clean cscope distclean dvi html info install install-doc \ - recurse-all speed tar tarbin test -@@ -231,30 +231,30 @@ BLOBS= - endif - - install-doc: $(DOCS) -- mkdir -p "$(DESTDIR)$(docdir)" -- $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" -+ $(INSTALL_DIR) "$(DESTDIR)$(docdir)" -+ $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" - ifndef CONFIG_WIN32 -- mkdir -p "$(DESTDIR)$(mandir)/man1" -- $(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" -- mkdir -p "$(DESTDIR)$(mandir)/man8" -- $(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" -+ $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" -+ $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" -+ $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -+ $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" - endif - - install: all $(if $(BUILD_DOCS),install-doc) -- mkdir -p "$(DESTDIR)$(bindir)" -+ $(INSTALL_DIR) "$(DESTDIR)$(bindir)" - ifneq ($(TOOLS),) -- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" -+ $(INSTALL_PROG) -s $(TOOLS) "$(DESTDIR)$(bindir)" - endif - ifneq ($(BLOBS),) -- mkdir -p "$(DESTDIR)$(datadir)" -+ $(INSTALL_DIR) "$(DESTDIR)$(datadir)" - set -e; for x in $(BLOBS); do \ -- $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ -+ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ - done - endif - ifndef CONFIG_WIN32 -- mkdir -p "$(DESTDIR)$(datadir)/keymaps" -+ $(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps" - set -e; for x in $(KEYMAPS); do \ -- $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ -+ $(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ - done - endif - for d in $(TARGET_DIRS); do \ -@@ -275,7 +275,7 @@ cscope: - - # documentation - %.html: %.texi -- texi2html -monolithic -number $< -+ texi2html -monolithic -number-sections $< - - %.info: %.texi - makeinfo $< -o $@ -@@ -284,15 +284,15 @@ cscope: - texi2dvi $< - - qemu.1: qemu-doc.texi -- $(SRC_PATH)/texi2pod.pl $< qemu.pod -+ perl $(SRC_PATH)/texi2pod.pl $< qemu.pod - pod2man --section=1 --center=" " --release=" " qemu.pod > $@ - - qemu-img.1: qemu-img.texi -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod -+ perl $(SRC_PATH)/texi2pod.pl $< qemu-img.pod - pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@ - - qemu-nbd.8: qemu-nbd.texi -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod -+ perl $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod - pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@ - - info: qemu-doc.info qemu-tech.info diff --git a/sysutils/xentools41/patches/patch-dc b/sysutils/xentools41/patches/patch-dc deleted file mode 100644 index 6b54034f40a..00000000000 --- a/sysutils/xentools41/patches/patch-dc +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-dc,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ - -From sysutils/xentools33/patches/patch-ak. - -qemu-0.13.x will include this fix: -http://git.qemu.org/qemu.git/commit/?id=9651ac55e5de0e1534d898316cc851af6ffc4334 - ---- ioemu-qemu-xen/hw/e1000.c.orig 2009-08-06 12:56:34.000000000 +0000 -+++ ioemu-qemu-xen/hw/e1000.c -@@ -244,16 +244,20 @@ set_eecd(E1000State *s, int index, uint3 - - s->eecd_state.old_eecd = val & (E1000_EECD_SK | E1000_EECD_CS | - E1000_EECD_DI|E1000_EECD_FWE_MASK|E1000_EECD_REQ); -+ if (!(E1000_EECD_CS & val)) // CS inactive; nothing to do -+ return; -+ if (E1000_EECD_CS & (val ^ oldval)) { // CS rise edge; reset state -+ s->eecd_state.val_in = 0; -+ s->eecd_state.bitnum_in = 0; -+ s->eecd_state.bitnum_out = 0; -+ s->eecd_state.reading = 0; -+ } - if (!(E1000_EECD_SK & (val ^ oldval))) // no clock edge - return; - if (!(E1000_EECD_SK & val)) { // falling edge - s->eecd_state.bitnum_out++; - return; - } -- if (!(val & E1000_EECD_CS)) { // rising, no CS (EEPROM reset) -- memset(&s->eecd_state, 0, sizeof s->eecd_state); -- return; -- } - s->eecd_state.val_in <<= 1; - if (val & E1000_EECD_DI) - s->eecd_state.val_in |= 1; diff --git a/sysutils/xentools41/patches/patch-dd b/sysutils/xentools41/patches/patch-dd deleted file mode 100644 index b32e08c243f..00000000000 --- a/sysutils/xentools41/patches/patch-dd +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-dd,v 1.3 2011/10/26 13:39:49 bouyer Exp $ - ---- ../tools/examples/Makefile.orig 2011-10-20 19:05:41.000000000 +0200 -+++ ../tools/examples/Makefile 2011-10-26 13:55:46.000000000 +0200 -@@ -1,5 +1,6 @@ - XEN_ROOT = $(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk -+XEN_CONFIG_DIR=${EGDIR} - - # Init scripts. - XEND_INITD = init.d/xend diff --git a/sysutils/xentools41/patches/patch-de b/sysutils/xentools41/patches/patch-de deleted file mode 100644 index 8fe1dc8cd15..00000000000 --- a/sysutils/xentools41/patches/patch-de +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-de,v 1.3 2011/10/26 13:39:49 bouyer Exp $ - ---- ../tools/hotplug/common/Makefile.orig 2011-10-20 19:05:42.000000000 +0200 -+++ ../tools/hotplug/common/Makefile 2011-10-26 13:57:09.000000000 +0200 -@@ -1,5 +1,6 @@ - XEN_ROOT = $(CURDIR)/../../.. - include $(XEN_ROOT)/tools/Rules.mk -+XEN_SCRIPT_DIR = ${EGDIR}/scripts - - HOTPLUGPATH="hotplugpath.sh" - diff --git a/sysutils/xentools41/patches/patch-df b/sysutils/xentools41/patches/patch-df deleted file mode 100644 index 7d117eeb23f..00000000000 --- a/sysutils/xentools41/patches/patch-df +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-df,v 1.2 2015/06/11 17:42:43 bouyer Exp $ - ---- ioemu-qemu-xen/hw/ide.c.orig 2014-01-09 13:44:42.000000000 +0100 -+++ ioemu-qemu-xen/hw/ide.c 2015-06-11 16:15:49.000000000 +0200 -@@ -757,10 +757,15 @@ - put_le16(p + 58, oldsize >> 16); - if (s->mult_sectors) - put_le16(p + 59, 0x100 | s->mult_sectors); -- put_le16(p + 60, s->nb_sectors); -- put_le16(p + 61, s->nb_sectors >> 16); -+ if (s->nb_sectors > 0x10000000) -+ oldsize = 0x10000000; /* report only 128GB */ -+ else -+ oldsize = s->nb_sectors; -+ put_le16(p + 60, oldsize); -+ put_le16(p + 61, oldsize >> 16); - put_le16(p + 62, 0x07); /* single word dma0-2 supported */ - put_le16(p + 63, 0x07); /* mdma0-2 supported */ -+ put_le16(p + 64, 0x03); /* pio3-4 supported */ - put_le16(p + 65, 120); - put_le16(p + 66, 120); - put_le16(p + 67, 120); -@@ -812,13 +817,12 @@ - put_le16(p + 53, 7); /* words 64-70, 54-58, 88 valid */ - put_le16(p + 62, 7); /* single word dma0-2 supported */ - put_le16(p + 63, 7); /* mdma0-2 supported */ -- put_le16(p + 64, 0x3f); /* PIO modes supported */ - #else - put_le16(p + 49, 1 << 9); /* LBA supported, no DMA */ - put_le16(p + 53, 3); /* words 64-70, 54-58 valid */ - put_le16(p + 63, 0x103); /* DMA modes XXX: may be incorrect */ -- put_le16(p + 64, 1); /* PIO modes */ - #endif -+ put_le16(p + 64, 3); /* pio3-4 supported */ - put_le16(p + 65, 0xb4); /* minimum DMA multiword tx cycle time */ - put_le16(p + 66, 0xb4); /* recommended DMA multiword tx cycle time */ - put_le16(p + 67, 0x12c); /* minimum PIO cycle time without flow control */ diff --git a/sysutils/xentools41/patches/patch-firmware_hvmloader_Makefile b/sysutils/xentools41/patches/patch-firmware_hvmloader_Makefile deleted file mode 100644 index 3c0d5803166..00000000000 --- a/sysutils/xentools41/patches/patch-firmware_hvmloader_Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-firmware_hvmloader_Makefile,v 1.1 2013/04/11 19:57:53 joerg Exp $ - ---- firmware/hvmloader/Makefile.orig 2013-03-25 19:35:30.000000000 +0000 -+++ firmware/hvmloader/Makefile -@@ -26,7 +26,7 @@ SUBDIRS := acpi - # The HVM loader is started in 32-bit mode at the address below: - LOADADDR = 0x100000 - --CFLAGS += $(CFLAGS_include) -I. -+CFLAGS += $(CFLAGS_include) -I. $(EXTRA_CFLAGS) - - SRCS = hvmloader.c mp_tables.c util.c smbios.c - SRCS += 32bitbios_support.c smp.c cacheattr.c xenbus.c diff --git a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pass-through.c b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pass-through.c deleted file mode 100644 index 8ae45bf86a9..00000000000 --- a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pass-through.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ioemu-qemu-xen_hw_pass-through.c,v 1.2 2012/05/30 03:27:05 taca Exp $ - ---- ioemu-qemu-xen/hw/pass-through.c.orig 2012-05-24 16:05:23.000000000 +0200 -+++ ioemu-qemu-xen/hw/pass-through.c 2012-05-24 16:06:19.000000000 +0200 -@@ -84,8 +84,6 @@ - */ - - #include "pass-through.h" --#include "pci/header.h" --#include "pci/pci.h" - #include "pt-msi.h" - #include "qemu-xen.h" - #include "iomulti.h" diff --git a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pass-through.h b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pass-through.h deleted file mode 100644 index 265f4dc8a25..00000000000 --- a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pass-through.h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ioemu-qemu-xen_hw_pass-through.h,v 1.1 2012/05/29 15:01:34 bouyer Exp $ - ---- ioemu-qemu-xen/hw/pass-through.h.orig 2012-05-24 15:57:12.000000000 +0200 -+++ ioemu-qemu-xen/hw/pass-through.h 2012-05-24 15:58:46.000000000 +0200 -@@ -20,8 +20,13 @@ - - #include "hw.h" - #include "pci.h" -+#ifdef __NetBSD__ -+#include "pciutils/header.h" -+#include "pciutils/pci.h" -+#else - #include "pci/header.h" - #include "pci/pci.h" -+#endif - #include "exec-all.h" - #include "sys-queue.h" - #include "qemu-timer.h" diff --git a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_piix4acpi.c b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_piix4acpi.c deleted file mode 100644 index 225d4a283d2..00000000000 --- a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_piix4acpi.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ioemu-qemu-xen_hw_piix4acpi.c,v 1.1 2012/05/30 08:29:44 bouyer Exp $ - ---- ioemu-qemu-xen/hw/piix4acpi.c.orig 2012-05-30 10:21:32.000000000 +0200 -+++ ioemu-qemu-xen/hw/piix4acpi.c 2012-05-30 10:23:11.000000000 +0200 -@@ -41,8 +41,12 @@ - #define PIIX4ACPI_LOG(level, fmt, ...) do { if (level <= PIIX4ACPI_LOGLEVEL) qemu_log(fmt, ## __VA_ARGS__); } while (0) - - #ifdef CONFIG_PASSTHROUGH -+#ifdef __NetBSD__ -+#include <pciutils/header.h> -+#else - #include <pci/header.h> - #endif -+#endif - - /* PM1a_CNT bits, as defined in the ACPI specification. */ - #define SCI_EN (1 << 0) diff --git a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-graphics.c b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-graphics.c deleted file mode 100644 index 9ef4c7fe9c0..00000000000 --- a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-graphics.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ioemu-qemu-xen_hw_pt-graphics.c,v 1.1 2012/05/29 15:01:34 bouyer Exp $ - ---- ioemu-qemu-xen/hw/pt-graphics.c.orig 2012-05-24 16:16:49.000000000 +0200 -+++ ioemu-qemu-xen/hw/pt-graphics.c 2012-05-24 16:16:55.000000000 +0200 -@@ -3,8 +3,6 @@ - */ - - #include "pass-through.h" --#include "pci/header.h" --#include "pci/pci.h" - - #include <unistd.h> - #include <sys/ioctl.h> diff --git a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-msi.c b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-msi.c deleted file mode 100644 index 16a062bf7c9..00000000000 --- a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-msi.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ioemu-qemu-xen_hw_pt-msi.c,v 1.1 2012/05/29 15:01:34 bouyer Exp $ - ---- ioemu-qemu-xen/hw/pt-msi.c.orig 2012-05-24 13:27:50.000000000 +0200 -+++ ioemu-qemu-xen/hw/pt-msi.c 2012-05-24 13:28:42.000000000 +0200 -@@ -22,6 +22,10 @@ - #include "pt-msi.h" - #include <sys/mman.h> - -+#ifdef __NetBSD__ -+#define MAP_LOCKED MAP_WIRED -+#endif -+ - void msi_set_enable(struct pt_dev *dev, int en) - { - uint16_t val = 0; diff --git a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-msi.h b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-msi.h deleted file mode 100644 index bad2a3451c5..00000000000 --- a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_pt-msi.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ioemu-qemu-xen_hw_pt-msi.h,v 1.1 2012/05/29 15:01:34 bouyer Exp $ - ---- ioemu-qemu-xen/hw/pt-msi.h.orig 2012-05-24 16:09:24.000000000 +0200 -+++ ioemu-qemu-xen/hw/pt-msi.h 2012-05-24 16:15:19.000000000 +0200 -@@ -1,7 +1,6 @@ - #ifndef _PT_MSI_H - #define _PT_MSI_H - --#include "pci/pci.h" - #include "pass-through.h" - - #define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ diff --git a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_xen-hooks.mak b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_xen-hooks.mak deleted file mode 100644 index 81bfc32a0e1..00000000000 --- a/sysutils/xentools41/patches/patch-ioemu-qemu-xen_xen-hooks.mak +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ioemu-qemu-xen_xen-hooks.mak,v 1.1 2012/05/29 15:01:34 bouyer Exp $ - -enable PCI passthrough when pciutils is present - ---- ioemu-qemu-xen/xen-hooks.mak.orig 2012-05-24 15:41:11.000000000 +0200 -+++ ioemu-qemu-xen/xen-hooks.mak 2012-05-24 15:46:21.000000000 +0200 -@@ -55,17 +55,25 @@ - ifdef CONFIG_STUBDOM - CONFIG_PASSTHROUGH=1 - else -- ifeq (,$(wildcard /usr/include/pci)) -+ ifeq ($(CONFIG_NetBSD), y) -+CONFIG_PASSTHROUGH=1 -+ else -+ ifeq (,$(wildcard /usr/include/pci)) - $(warning === pciutils-dev package not found - missing /usr/include/pci) - $(warning === PCI passthrough capability has been disabled) -- else -+ else - CONFIG_PASSTHROUGH=1 -+ endif - endif - endif - - ifdef CONFIG_PASSTHROUGH - OBJS+= pass-through.o pt-msi.o pt-graphics.o -+ifeq ($(CONFIG_NetBSD), y) -+LIBS += -lpciutils -lpci -+else - LIBS += -lpci -+endif - CFLAGS += -DCONFIG_PASSTHROUGH - $(info === PCI passthrough capability has been enabled ===) - endif diff --git a/sysutils/xentools41/patches/patch-libfsimage_ufs_ufs.h b/sysutils/xentools41/patches/patch-libfsimage_ufs_ufs.h deleted file mode 100644 index 8e09493fc06..00000000000 --- a/sysutils/xentools41/patches/patch-libfsimage_ufs_ufs.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-libfsimage_ufs_ufs.h,v 1.1 2013/07/16 22:28:26 joerg Exp $ - ---- libfsimage/ufs/ufs.h.orig 2013-07-14 19:44:35.000000000 +0000 -+++ libfsimage/ufs/ufs.h -@@ -4,7 +4,7 @@ - */ - - #ifndef _GRUB_UFS_H --#define _GRUB_UFS_H_ -+#define _GRUB_UFS_H - - /* ufs specific constants */ - #define UFS_SBLOCK 16 diff --git a/sysutils/xentools41/patches/patch-libxl_libxl_create.c b/sysutils/xentools41/patches/patch-libxl_libxl_create.c deleted file mode 100644 index cc244e3e1a7..00000000000 --- a/sysutils/xentools41/patches/patch-libxl_libxl_create.c +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-libxl_libxl_create.c,v 1.1 2011/10/29 14:16:53 jmcneill Exp $ - ---- libxl/libxl_create.c.orig 2011-10-20 17:05:42.000000000 +0000 -+++ libxl/libxl_create.c -@@ -171,7 +171,7 @@ int libxl__domain_build(libxl_ctx *ctx, - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; -- vments[5] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[5] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); - } else { - ret = libxl__build_pv(ctx, domid, info, state); - if (ret) -@@ -184,7 +184,7 @@ int libxl__domain_build(libxl_ctx *ctx, - vments[i++] = "image/kernel"; - vments[i++] = (char*) info->kernel.path; - vments[i++] = "start_time"; -- vments[i++] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[i++] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); - if (info->u.pv.ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char*) info->u.pv.ramdisk.path; -@@ -227,7 +227,7 @@ static int domain_restore(libxl_ctx *ctx - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; -- vments[5] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[5] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); - } else { - vments = libxl__calloc(&gc, 11, sizeof(char *)); - i = 0; -@@ -236,7 +236,7 @@ static int domain_restore(libxl_ctx *ctx - vments[i++] = "image/kernel"; - vments[i++] = (char*) info->kernel.path; - vments[i++] = "start_time"; -- vments[i++] = libxl__sprintf(&gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[i++] = libxl__sprintf(&gc, "%llu.%02d", (unsigned long long)start_time.tv_sec,(int)start_time.tv_usec/10000); - if (info->u.pv.ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char*) info->u.pv.ramdisk.path; diff --git a/sysutils/xentools41/patches/patch-libxl_libxl_internal.h b/sysutils/xentools41/patches/patch-libxl_libxl_internal.h deleted file mode 100644 index 6173ba379c8..00000000000 --- a/sysutils/xentools41/patches/patch-libxl_libxl_internal.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-libxl_libxl_internal.h,v 1.1 2012/05/29 15:01:34 bouyer Exp $ - ---- libxl/libxl_internal.h.orig 2012-05-24 13:31:11.000000000 +0200 -+++ libxl/libxl_internal.h 2012-05-24 13:31:14.000000000 +0200 -@@ -109,7 +109,11 @@ - #define XC_PCI_BDF "0x%x, 0x%x, 0x%x, 0x%x" - #define AUTO_PHP_SLOT 0x100 - #define SYSFS_PCI_DEV "/sys/bus/pci/devices" -+#ifdef __NetBSD__ -+#define SYSFS_PCIBACK_DRIVER "/kern/xen/pci" -+#else - #define SYSFS_PCIBACK_DRIVER "/sys/bus/pci/drivers/pciback" -+#endif - #define XENSTORE_PID_FILE "/var/run/xenstored.pid" - - #define PROC_PCI_NUM_RESOURCES 7 diff --git a/sysutils/xentools41/patches/patch-libxl_xl__cmdimpl.c b/sysutils/xentools41/patches/patch-libxl_xl__cmdimpl.c deleted file mode 100644 index c431959d3bc..00000000000 --- a/sysutils/xentools41/patches/patch-libxl_xl__cmdimpl.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-libxl_xl__cmdimpl.c,v 1.1 2013/05/06 14:59:11 joerg Exp $ - ---- libxl/xl_cmdimpl.c.orig 2013-05-05 19:37:21.000000000 +0000 -+++ libxl/xl_cmdimpl.c -@@ -922,7 +922,7 @@ skip: - - for (p = strtok(buf2, ","); p; p = strtok(NULL, ",")) { - char* val; -- while (isblank(*p)) -+ while (isblank((unsigned char)*p)) - p++; - val = strchr(p, '='); - if (val == NULL) diff --git a/sysutils/xentools41/patches/patch-ocaml_Makefile.rules b/sysutils/xentools41/patches/patch-ocaml_Makefile.rules deleted file mode 100644 index 90bcedcea83..00000000000 --- a/sysutils/xentools41/patches/patch-ocaml_Makefile.rules +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ocaml_Makefile.rules,v 1.1 2013/03/15 16:10:58 is Exp $ - ---- ocaml/Makefile.rules.orig 2012-08-10 13:51:28.000000000 +0000 -+++ ocaml/Makefile.rules -@@ -65,7 +65,7 @@ define OCAML_LIBRARY_template - $(1)_stubs.a: $(foreach obj,$$($(1)_C_OBJS),$(obj).o) - $(call mk-caml-stubs,$$@, $$+) - lib$(1)_stubs.a: $(foreach obj,$($(1)_C_OBJS),$(obj).o) -- $(call mk-caml-lib-stubs,$$@, $$+, $(LIBS_$(1))) -+ $(call mk-caml-lib-stubs,$$@, $$+, -dllpath $(PREFIX)/lib $(LIBS_$(1))) - endef - - define OCAML_NOC_LIBRARY_template diff --git a/sysutils/xentools41/patches/patch-ocaml_common.make b/sysutils/xentools41/patches/patch-ocaml_common.make deleted file mode 100644 index 97b9995fd9e..00000000000 --- a/sysutils/xentools41/patches/patch-ocaml_common.make +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ocaml_common.make,v 1.1 2013/03/15 16:10:58 is Exp $ - ---- ocaml/common.make.orig 2013-03-13 09:31:47.000000000 +0000 -+++ ocaml/common.make -@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk - CC ?= gcc - OCAMLOPT ?= ocamlopt - OCAMLC ?= ocamlc --OCAMLMKLIB ?= ocamlmklib -+OCAMLMKLIB ?= ocamlmklib -elfmode - OCAMLDEP ?= ocamldep - OCAMLLEX ?= ocamllex - OCAMLYACC ?= ocamlyacc diff --git a/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c b/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c deleted file mode 100644 index 15639b668f2..00000000000 --- a/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ocaml_libs_xb_xs__ring__stubs.c,v 1.1 2016/10/01 13:07:23 joerg Exp $ - ---- ocaml/libs/xb/xs_ring_stubs.c.orig 2016-09-30 12:57:34.000000000 +0000 -+++ ocaml/libs/xb/xs_ring_stubs.c -@@ -46,8 +46,8 @@ static int xs_ring_read(struct mmap_inte - XENSTORE_RING_IDX cons, prod; /* offsets only */ - int to_read; - -- cons = *(volatile uint32*)&intf->req_cons; -- prod = *(volatile uint32*)&intf->req_prod; -+ cons = *(volatile uint32_t*)&intf->req_cons; -+ prod = *(volatile uint32_t*)&intf->req_prod; - xen_mb(); - - if ((prod - cons) > XENSTORE_RING_SIZE) -@@ -76,8 +76,8 @@ static int xs_ring_write(struct mmap_int - XENSTORE_RING_IDX cons, prod; - int can_write; - -- cons = *(volatile uint32*)&intf->rsp_cons; -- prod = *(volatile uint32*)&intf->rsp_prod; -+ cons = *(volatile uint32_t*)&intf->rsp_cons; -+ prod = *(volatile uint32_t*)&intf->rsp_prod; - xen_mb(); - if ( (prod - cons) >= XENSTORE_RING_SIZE ) - return 0; diff --git a/sysutils/xentools41/patches/patch-ocaml_xenstored_define.ml b/sysutils/xentools41/patches/patch-ocaml_xenstored_define.ml deleted file mode 100644 index b9551239022..00000000000 --- a/sysutils/xentools41/patches/patch-ocaml_xenstored_define.ml +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ocaml_xenstored_define.ml,v 1.1 2013/03/15 16:10:58 is Exp $ - ---- ocaml/xenstored/define.ml.orig 2012-11-24 07:27:21.000000000 +0000 -+++ ocaml/xenstored/define.ml 2012-11-24 07:33:59.000000000 +0000 -@@ -17,13 +17,13 @@ - let xenstored_major = 1 - let xenstored_minor = 0 - --let xenstored_proc_kva = "/proc/xen/xsd_kva" -+let xenstored_proc_kva = "@PROCDEV@/xsd_kva" - let xenstored_proc_port = "/proc/xen/xsd_port" - - let xs_daemon_socket = "/var/run/xenstored/socket" - let xs_daemon_socket_ro = "/var/run/xenstored/socket_ro" - --let default_config_dir = "/etc/xensource" -+let default_config_dir = "@XENDCONFDIR@" - - let maxwatch = ref (50) - let maxtransaction = ref (20) diff --git a/sysutils/xentools41/patches/patch-ocaml_xenstored_utils.ml b/sysutils/xentools41/patches/patch-ocaml_xenstored_utils.ml deleted file mode 100644 index f22413b3b61..00000000000 --- a/sysutils/xentools41/patches/patch-ocaml_xenstored_utils.ml +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ocaml_xenstored_utils.ml,v 1.1 2013/03/15 16:10:58 is Exp $ - ---- ocaml/xenstored/utils.ml.orig -+++ ocaml/xenstored/utils.ml -@@ -87,7 +83,7 @@ let read_file_single_integer filename = - let buf = String.make 20 (char_of_int 0) in - let sz = Unix.read fd buf 0 20 in - Unix.close fd; -- int_of_string (String.sub buf 0 sz) -+ int_of_string (String.trim (String.sub buf 0 sz)) - - let path_complete path connection_path = - if String.get path 0 <> '/' then diff --git a/sysutils/xentools41/patches/patch-qemu-phy-devices b/sysutils/xentools41/patches/patch-qemu-phy-devices deleted file mode 100644 index fd1ec60fc65..00000000000 --- a/sysutils/xentools41/patches/patch-qemu-phy-devices +++ /dev/null @@ -1,97 +0,0 @@ -$NetBSD: patch-qemu-phy-devices,v 1.1 2011/05/20 17:09:21 bouyer Exp $ - -This does 2 things: -- use the correct way to get the size of a disk device or partition (from - haad@NetBSD.org) -- if given a block device, use the character device instead. - ---- ioemu-qemu-xen/block-raw-posix.c.orig 2011-05-20 16:47:37.000000000 +0200 -+++ ioemu-qemu-xen/block-raw-posix.c 2011-05-20 18:06:44.000000000 +0200 -@@ -66,6 +66,13 @@ - #include <sys/disklabel.h> - #include <sys/dkio.h> - #endif -+#if defined(__NetBSD__) -+#include <sys/ioctl.h> -+#include <sys/disklabel.h> -+#include <sys/dkio.h> -+#define SLIST_ENTRY(x) int /*XXXX !*/ -+#include <sys/disk.h> -+#endif - - //#define DEBUG_FLOPPY - -@@ -120,6 +127,33 @@ - { - BDRVRawState *s = bs->opaque; - int fd, open_flags, ret; -+#ifdef __NetBSD__ -+ struct stat sb; -+ static char namebuf[MAXPATHLEN]; -+ const char *dp; -+ -+ if (lstat(filename, &sb) < 0) { -+ fprintf(stderr, "%s: stat failed: %s\n", filename, strerror(errno)); -+ return -errno; -+ } -+ if (S_ISLNK(sb.st_mode)) { -+ fprintf(stderr, "%s: symolink links not supported by qemu-dm\n", -+ filename); -+ return -EINVAL; -+ } -+ if (S_ISBLK(sb.st_mode)) { -+ dp = strrchr(filename, '/'); -+ if (dp == NULL) { -+ snprintf(namebuf, MAXPATHLEN, "r%s", filename); -+ } else { -+ snprintf(namebuf, MAXPATHLEN, "%.*s/r%s", -+ (int)(dp - filename), filename, dp + 1); -+ } -+ fprintf(stderr, "%s is a block device", filename); -+ filename = namebuf; -+ fprintf(stderr, ", using %s\n", filename); -+ } -+#endif - - posix_aio_init(); - -@@ -749,7 +783,7 @@ - return 0; - } - --#ifdef __OpenBSD__ -+#if defined(__OpenBSD__) || defined(__NetBSD__) - static int64_t raw_getlength(BlockDriverState *bs) - { - BDRVRawState *s = bs->opaque; -@@ -759,16 +793,29 @@ - if (fstat(fd, &st)) - return -1; - if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) { -+#if defined(__OpenBSD__) - struct disklabel dl; - - if (ioctl(fd, DIOCGDINFO, &dl)) - return -1; - return (uint64_t)dl.d_secsize * - dl.d_partitions[DISKPART(st.st_rdev)].p_size; -+#else -+ struct dkwedge_info dkw; -+ if (ioctl(fd, DIOCGWEDGEINFO, &dkw) != -1) { -+ return dkw.dkw_size * 512; -+ } else { -+ struct disklabel dl; -+ if(ioctl(fd, DIOCGDINFO, &dl)) -+ return -1; -+ return (uint64_t)dl.d_secsize * -+ dl.d_partitions[DISKPART(st.st_rdev)].p_size; -+ } -+#endif - } else - return st.st_size; - } --#else /* !__OpenBSD__ */ -+#else /* !__OpenBSD__ && ! __NetBSD__ */ - static int64_t raw_getlength(BlockDriverState *bs) - { - BDRVRawState *s = bs->opaque; diff --git a/sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile b/sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile deleted file mode 100644 index 617c96d8b2d..00000000000 --- a/sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-xenstat_libxenstat_Makefile,v 1.2 2014/05/14 20:22:41 bouyer Exp $ - ---- xenstat/libxenstat/Makefile.orig 2013-03-25 19:37:42.000000000 +0000 -+++ xenstat/libxenstat/Makefile -@@ -40,7 +40,7 @@ - LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ - LDLIBS-y = -lxenstore -lxenctrl - LDLIBS-$(CONFIG_SunOS) += -lkstat --ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so -+ARLIBS-y = - ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so - ARLIBS-x86_32 = /usr/lib/libkstat.so - ARLIBS-$(CONFIG_SunOS) += $(ARLIBS-$(XEN_TARGET_ARCH)) -@@ -57,13 +57,13 @@ - $(OBJECTS-y) $(LDLIBS-y) - - src/xenstat.o: src/xenstat.c src/xenstat.h src/xenstat_priv.h -- $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< -+ $(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@ $< - - src/xenstat_linux.o: src/xenstat_linux.c src/xenstat_priv.h -- $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< -+ $(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@ $< - - src/xenstat_solaris.o: src/xenstat_solaris.c src/xenstat_priv.h -- $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< -+ $(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@ $< - - src/libxenstat.so.$(MAJOR): $(LIB) - $(MAKE_LINK) $(<F) $@ diff --git a/sysutils/xentools41/patches/patch-xenstat_xentop_Makefile b/sysutils/xentools41/patches/patch-xenstat_xentop_Makefile deleted file mode 100644 index 0ccceeb4f21..00000000000 --- a/sysutils/xentools41/patches/patch-xenstat_xentop_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xenstat_xentop_Makefile,v 1.1 2014/05/14 20:22:41 bouyer Exp $ - ---- xenstat/xentop/Makefile.orig 2014-05-14 15:15:54.000000000 +0200 -+++ xenstat/xentop/Makefile 2014-05-14 15:15:56.000000000 +0200 -@@ -19,8 +19,8 @@ - else - - CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) --LDFLAGS += -L$(XEN_LIBXENSTAT) --LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) -+LDFLAGS += -L$(XEN_LIBXENSTAT) -L$(XEN_XENSTORE) -L$(XEN_LIBXC) -+LDLIBS += -lxenstat -lxenstore -lxenctrl $(CURSES_LIBS) $(SOCKET_LIBS) - CFLAGS += -DHOST_$(XEN_OS) - - .PHONY: all diff --git a/sysutils/xentools41/patches/patch-xenstore_Makefile b/sysutils/xentools41/patches/patch-xenstore_Makefile deleted file mode 100644 index bd579027ac1..00000000000 --- a/sysutils/xentools41/patches/patch-xenstore_Makefile +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-xenstore_Makefile,v 1.1 2011/10/03 16:58:57 sborrill Exp $ - -Adds a target to install just the useful bits for the xenstore tools. - -Used by sysutils/xenstoretools only, but patch maintained here in xentools41 as -xenstoretools shares the same distinfo. - ---- xenstore/Makefile.orig 2011-06-14 17:03:45.000000000 +0100 -+++ xenstore/Makefile 2011-10-03 13:16:43.000000000 +0100 -@@ -111,6 +111,19 @@ - $(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR) - -+.PHONY: install -+installclients: clients -+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR) -+ $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) -+ $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) -+ set -e ; for c in $(CLIENTS) ; do \ -+ ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ -+ done -+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) -+ $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) -+ ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) -+ ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so -+ - -include $(DEPS) - - # never delete any intermediate files. diff --git a/sysutils/xentools41/version.mk b/sysutils/xentools41/version.mk deleted file mode 100644 index 5e6d08ad9f6..00000000000 --- a/sysutils/xentools41/version.mk +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: version.mk,v 1.7 2013/09/11 18:00:33 drochner Exp $ - -# Version number is used by xentools41 and xenstoretools - -VERSION= 4.1.6.1 -VERSION_IPXE= 1.0.0 |