Remove this ancient VMware 3 port for the kernel LKMs. They have never

really worked very well and with newer kernels they do not work at all.

PR 5893.
This commit is contained in:
brad 2008-09-30 17:39:24 +00:00
parent 9aefac75de
commit 0f0a23511a
25 changed files with 1 additions and 905 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.45 2008/06/18 20:11:21 sturm Exp $
# $OpenBSD: Makefile,v 1.46 2008/09/30 17:39:24 brad Exp $
SUBDIR += BasiliskII
SUBDIR += bochs
@ -28,7 +28,6 @@
SUBDIR += uae
SUBDIR += vba
SUBDIR += vgb
SUBDIR += vmware/3
SUBDIR += wine
SUBDIR += x48
SUBDIR += xcopilot

View File

@ -1,111 +0,0 @@
# $OpenBSD: Makefile,v 1.13 2007/09/16 00:45:13 merdely Exp $
ONLY_FOR_ARCHS= i386
COMMENT= VMware emulator
DISTNAME= VMware-workstation-3.2.1-2242
PKGNAME= vmware-3.2.1_2242p7
CATEGORIES= emulators
MASTER_SITES= http://download3.vmware.com/software/wkst/
MASTER_SITES0= http://monkey.org/~marius/vmware-openbsd/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
vmware-openbsd-1.3${EXTRACT_SUFX}:0
HOMEPAGE= http://www.vmware.com/
MAINTAINER= Todd T. Fries <todd@openbsd.org>
# Restrictive
PERMIT_DISTFILES_CDROM= No
PERMIT_DISTFILES_FTP= No
PERMIT_PACKAGE_CDROM= No
PERMIT_PACKAGE_FTP= No
WANTLIB= c
#NO_BUILD= Yes
NO_REGRESS= Yes
USE_X11= Yes
RUN_DEPENDS+= ::emulators/fedora/base
BUILD_DEPENDS+= ${RUN_DEPENDS}
WRKDIST= ${WRKDIR}/vmware-openbsd
VMWARE_DISTRIB= ${WRKDIR}/vmware-distrib
LIB_DATA_DIRS= configurator \
isoimages \
messages/chef \
messages/ja \
messages/jive \
smb/codepages \
help \
xkeymap
post-patch:
@chmod 755 ${VMWARE_DISTRIB}/bin/vmware
@if [ x`sysctl -n kern.emul.linux` = x1 ]; then \
${WRKDIST}/vmware-any-any-update37/update ${VMWARE_DISTRIB}/bin/vmware; \
else \
echo "need to set kern.emul.linux=1"; \
exit 1; \
fi
do-configure:
@perl -pi -e 's|_PREFIX_|${PREFIX}|g' ${WRKSRC}/util/vmware-run.c
pre-install:
@sed -e "s|@PREFIX@|${TRUEPREFIX}|g" ${FILESDIR}/vmware-modules.sh > \
${WRKBUILD}/vmware-modules.sh
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/vmware
${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/vmware/bin
${INSTALL_SCRIPT} ${VMWARE_DISTRIB}/bin/vmware \
${PREFIX}/lib/vmware/bin
${INSTALL_SCRIPT} ${VMWARE_DISTRIB}/bin/vmnet-netifup ${PREFIX}/bin
${INSTALL_SCRIPT} ${VMWARE_DISTRIB}/lib/bin/* ${PREFIX}/lib/vmware/bin
@sed -e "s|@PREFIX@|${TRUEPREFIX}|g" ${FILESDIR}/vmware.sh > \
${PREFIX}/bin/vmware
@chown ${BINOWN} ${PREFIX}/bin/vmware
@chgrp ${BINGRP} ${PREFIX}/bin/vmware
@chmod ${BINMODE} ${PREFIX}/bin/vmware
${INSTALL_DATA_DIR} ${PREFIX}/lib/vmware/licenses/{site,user}
.for d in ${LIB_DATA_DIRS}
${INSTALL_DATA_DIR} ${PREFIX}/lib/vmware/${d}
${INSTALL_DATA} ${VMWARE_DISTRIB}/lib/${d}/* ${PREFIX}/lib/vmware/${d}
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vmware
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vmware
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/vmware
@sed -e "s|@PREFIX@|${TRUEPREFIX}|g" ${FILESDIR}/config > \
${PREFIX}/share/examples/vmware/config
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vmware
${INSTALL_DATA_DIR} ${PREFIX}/lib/vmware/modules
${INSTALL_DATA_DIR} ${PREFIX}/lib/vmware/bin
${INSTALL_DATA_DIR} ${PREFIX}/libexec
${INSTALL_DATA} ${WRKBUILD}/README \
${PREFIX}/share/doc/vmware/README.NetBSD
${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD \
${PREFIX}/share/doc/vmware/README.OpenBSD.Modules
${INSTALL_DATA} ${WRKBUILD}/source/linuxrtc/linuxrtc.o \
${WRKBUILD}/source/vmmon/vmmon.o \
${WRKBUILD}/source/vmnet/if_hub.o \
${PREFIX}/lib/vmware/modules
${INSTALL_PROGRAM} ${WRKBUILD}/vmware-any-any-update37/update \
${PREFIX}/lib/vmware/bin
${INSTALL_PROGRAM} ${WRKBUILD}/util/vmware-run ${PREFIX}/lib/vmware/bin
${INSTALL_SCRIPT} ${WRKBUILD}/source/linuxrtc/linuxrtc_post.sh \
${PREFIX}/libexec/vmware-linuxrtc_load.sh
${INSTALL_SCRIPT} ${WRKBUILD}/source/vmmon/vmmon_post.sh \
${PREFIX}/libexec/vmware-vmmon_load.sh
${INSTALL_SCRIPT} ${WRKBUILD}/source/vmnet/if_hub_post.sh \
${PREFIX}/libexec/vmware-vmnet_load.sh
.for S in linuxrtc vmmon vmnet
${INSTALL_SCRIPT} ${FILESDIR}/vmware-${S}_unload.sh \
${PREFIX}/libexec
.endfor
${INSTALL_SCRIPT} ${WRKBUILD}/vmware-modules.sh \
${PREFIX}/bin/vmware-modules
.include <bsd.port.mk>

View File

@ -1,10 +0,0 @@
MD5 (VMware-workstation-3.2.1-2242.tar.gz) = VtzPAiWCo3TPLqwGeWEVzw==
MD5 (vmware-openbsd-1.3.tar.gz) = tLxh+i1kG5ECl2tP9ciqVQ==
RMD160 (VMware-workstation-3.2.1-2242.tar.gz) = 8qbDzDjzw4UURuiQIje5WDZyk6E=
RMD160 (vmware-openbsd-1.3.tar.gz) = LZzhE7KEEVL+3BPdzcO3fk4Q+OA=
SHA1 (VMware-workstation-3.2.1-2242.tar.gz) = PzyFOScHBwh1JeIgJko4Y5vxdUc=
SHA1 (vmware-openbsd-1.3.tar.gz) = etaI6a7BLzNH49utrSwFfxuDEMs=
SHA256 (VMware-workstation-3.2.1-2242.tar.gz) = 7DBcplwuUTtdgJ5ZhJF20V3Pao+I49m8nOj9yln8Lfw=
SHA256 (vmware-openbsd-1.3.tar.gz) = 90IPA6A5zJJv8i9qolA3Evc08qXJQqIkG9kjUBsTNCM=
SIZE (VMware-workstation-3.2.1-2242.tar.gz) = 12577292
SIZE (vmware-openbsd-1.3.tar.gz) = 134939

View File

@ -1,60 +0,0 @@
# $OpenBSD: README.OpenBSD,v 1.3 2005/03/07 18:15:09 todd Exp $
Pre-requisites
--------------
1) Linux emulation must be enabled:
# sysctl kern.emul.linux=1
2) procfs mounted with Linux compatibility:
# mkdir /proc
# mount_procfs -o linux /proc /proc
3) Update /emul/linux/dev:
# cd /emul/linux/dev
# ln -sf tty1 tty0
Configuration / Execution
-------------------------
1) Edit /etc/vmware/config to suit your needs.
2) Load the LKMs:
# vmware-modules load
3) Bring up the vmware network interface(s):
# vmnet-netifup -d /var/run/vmnet1.pid /dev/vmnet1 vmnet1
4) Configure the network interface(s) (must match /etc/vmware/config):
# ifconfig vmnet1 192.168.0.20
5) Run vmware-run:
# vmware
Deinstallation / Shutdown
-------------------------
1) Shutdown vmnet-netifup:
# kill -INT `cat /var/run/vmnet1.pid`
2) Unload LKMs:
# vmware-modules unload
Bugs / Known Issues
-------------------
1) Virtual machines can only use "host networking", and you must bridge
vmnet1 to a real interface for it to work.
2) vmware3 doesn't respect ${SYSCONFDIR} due to paths being hardcoded.
3) These instructions are not complete ;)

View File

@ -1,9 +0,0 @@
vmware.fullpath = "@PREFIX@/bin/vmware"
wizard.fullpath = "@PREFIX@/bin/vmware-wizard"
dhcpd.fullpath = "@PREFIX@/bin/vmnet-dhcpd"
loop.fullpath = "@PREFIX@/bin/vmware-loop"
control.fullpath = "@PREFIX@/bin/vmware-control"
libdir = "@PREFIX@/lib/vmware"
vmnet1.HostOnlyAddress = "192.168.0.20"
vmnet1.HostOnlyNetMask = "255.255.255.0"
xinfo.noSHM = "true"

View File

@ -1,11 +0,0 @@
#!/bin/sh
# $OpenBSD: vmware-linuxrtc_unload.sh,v 1.3 2005/03/07 18:15:09 todd Exp $
dev=/dev/rtc
rm=/bin/rm
if [ -c $dev ]; then
$rm $dev
fi
exit 0

View File

@ -1,67 +0,0 @@
#!/bin/sh
# $OpenBSD: vmware-modules.sh,v 1.3 2005/03/07 18:15:09 todd Exp $
modload=/sbin/modload
modunload=/sbin/modunload
prefix=@PREFIX@
lkmbase=$prefix/lib/vmware/modules
scriptbase=$prefix/libexec/vmware
sysctl=/sbin/sysctl
sl=`$sysctl -n kern.securelevel`
check_perms()
{
if [ `id -u` -ne 0 ]; then
echo "ERROR: You must be root to run this script."
exit 1
fi
}
check_securelevel()
{
if [ "$sl" -gt 0 ]; then
echo "ERROR: The system's securelevel is currently $sl. It must be"
echo " less than or equal to 0 to load kernel modules."
echo " Consult securelevel(7) and rc(8) for more information"
echo " on lowering the securelevel and its effects."
fi
}
load_modules()
{
TMPFILE1=`mktemp /tmp/linuxrtc.XXXXXXXXXX` || exit 1
TMPFILE2=`mktemp /tmp/vmmon.XXXXXXXXXX` || exit 1
TMPFILE3=`mktemp /tmp/if_hub.XXXXXXXXXX` || exit 1
$modload -e rtc_lkmentry -o $TMPFILE1 \
-p $scriptbase-linuxrtc_load.sh $lkmbase/linuxrtc.o
$modload -e vmmon_lkmentry -o $TMPFILE2 \
-p $scriptbase-vmmon_load.sh $lkmbase/vmmon.o
$modload -e vmnet_lkmentry -o $TMPFILE3 \
-p $scriptbase-vmnet_load.sh $lkmbase/if_hub.o
}
unload_modules()
{
$modunload -n linuxrtc -p $scriptbase-linuxrtc_unload.sh
$modunload -n vmmon -p $scriptbase-vmmon_unload.sh
$modunload -n vmnet -p $scriptbase-vmnet_unload.sh
}
check_perms
check_securelevel
case $1 in
load)
load_modules
;;
unload)
unload_modules
;;
*)
echo "usage: $0 $1 [ load | unload ]"
exit 1
;;
esac
exit 0

View File

@ -1,11 +0,0 @@
#!/bin/sh
# $OpenBSD: vmware-vmmon_unload.sh,v 1.3 2005/03/07 18:15:09 todd Exp $
dev=/dev/vmmon
rm=/bin/rm
if [ -c $dev ]; then
$rm $dev
fi
exit 0

View File

@ -1,14 +0,0 @@
#!/bin/sh
# $OpenBSD: vmware-vmnet_unload.sh,v 1.3 2005/03/07 18:15:09 todd Exp $
dev=/dev/vmnet
rm=/bin/rm
for i in 0 1 2 3
do
if [ -c "$dev""$i" ]; then
$rm -f "$dev""$i"
fi
done
exit 0

View File

@ -1,13 +0,0 @@
#! /bin/sh
PREFIX=@PREFIX@
if [ ! -e /proc/cpuinfo ]; then
echo "ERROR: procfs must be mounted with the linux option in order"
echo " for VMware to run."
echo " Consult mount_procfs(8) for more information."
exit 1
fi
exec ${PREFIX}/lib/vmware/bin/vmware-run "$@"

View File

@ -1,7 +0,0 @@
$OpenBSD: patch-Makefile,v 1.3 2005/03/07 18:15:09 todd Exp $
--- Makefile.orig 2003-09-13 22:53:12.000000000 -0500
+++ Makefile 2003-09-13 22:54:32.000000000 -0500
@@ -0,0 +1,3 @@
+SUBDIR+=source
+SUBDIR+=util
+.include <bsd.subdir.mk>

View File

@ -1,8 +0,0 @@
$OpenBSD: patch-source_Makefile,v 1.3 2005/03/07 18:15:09 todd Exp $
--- source/Makefile.orig 2003-09-13 22:55:33.000000000 -0500
+++ source/Makefile 2003-09-13 22:56:28.000000000 -0500
@@ -0,0 +1,4 @@
+SUBDIR+=linuxrtc
+SUBDIR+=vmmon
+SUBDIR+=vmnet
+.include <bsd.subdir.mk>

View File

@ -1,10 +0,0 @@
$OpenBSD: patch-source_linuxrtc_Makefile,v 1.3 2005/03/07 18:15:09 todd Exp $
--- source/linuxrtc/Makefile.orig 2003-07-21 14:38:46.000000000 -0500
+++ source/linuxrtc/Makefile 2003-09-13 22:57:22.000000000 -0500
@@ -1,5 +1,5 @@
MODOBJ= linuxrtc.o
-CFLAGS= -D_KERNEL -I/sys
+CFLAGS+= -D_KERNEL -I/sys
SRCS= rtc.c
OBJS= ${SRCS:.c=.o}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-source_vmmon_Makefile,v 1.3 2005/03/07 18:15:09 todd Exp $
--- source/vmmon/Makefile.orig 2003-07-26 14:29:03.000000000 -0500
+++ source/vmmon/Makefile 2004-02-05 11:10:33.000000000 -0600
@@ -1,7 +1,7 @@
MODOBJ= vmmon.o
CFLAGS+= -D_KERNEL -I/sys -I. -I${.CURDIR}/include \
- -I${.CURDIR}/common -I${.CURDIR}/openbsd -DMODULE
+ -I${.CURDIR}/common -I${.CURDIR}/openbsd -I${.CURDIR}/../ -DMODULE
.PATH: ${.CURDIR}/common
.PATH: ${.CURDIR}/openbsd

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-source_vmmon_include_x86_h,v 1.2 2007/05/31 20:31:36 aanriot Exp $
--- source/vmmon/include/x86.h.orig Mon Jul 21 14:39:10 2003
+++ source/vmmon/include/x86.h Wed May 30 22:53:16 2007
@@ -299,14 +299,16 @@ OpsizeValue(uint32 value, // IN: The 32 bit value to b
#define MSR_L2CFG 0x0000011e
#if !defined(__NetBSD__) || !defined(MSR_TSC)
+# if !defined(__OpenBSD__)
#define MSR_TSC 0x00000010
+# endif
#define MSR_PERFCTR0 0x000000c1
#define MSR_PERFCTR1 0x000000c2
#define MSR_MTRR_CAP 0x000000fe
#define MSD_EVNTSEL0 0x00000186
#define MSR_EVNTSEL1 0x00000187
#endif
-#if !defined(__NetBSD__) || !defined(MSR_SYSENTER_CS)
+#if (!defined(__NetBSD__) && !defined(__OpenBSD__)) || !defined(MSR_SYSENTER_CS)
#define MSR_SYSENTER_CS 0x00000174
#define MSR_SYSENTER_ESP 0x00000175
#define MSR_SYSENTER_EIP 0x00000176

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-source_vmmon_openbsd_driver_h,v 1.3 2005/03/07 18:15:09 todd Exp $
--- source/vmmon/openbsd/driver.h.orig 2003-07-26 14:29:03.000000000 -0500
+++ source/vmmon/openbsd/driver.h 2004-02-05 11:10:33.000000000 -0600
@@ -67,7 +67,7 @@ struct vmmon_softc {
char buf[NETBSDLOG_BUFFER_SIZE];
};
-#define VMNUM(dev) (minor(dev) - 1)
-#define MAKEVMDEV(m,v) (makedev(major(m),(v)+1))
+#define VMNUM(dev) (minor(dev) - 2)
+#define MAKEVMDEV(m,v) (makedev(major(m),(v) + 2))
#endif

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-source_vmmon_openbsd_drv_c,v 1.4 2007/05/31 20:31:36 aanriot Exp $
--- source/vmmon/openbsd/drv.c.orig Sun Mar 14 14:58:50 2004
+++ source/vmmon/openbsd/drv.c Wed May 30 22:53:16 2007
@@ -414,6 +414,7 @@ vmmon_fake_clonedev(dev_t dev, int flag, struct proc *
#endif
p->p_dupfd = fd;
+ p->p_descfd = p->p_dupfd; /* XXX */
return ENXIO;
}
@@ -436,6 +437,7 @@ vmmon_alloc_low_pages(struct vmx86_softc *vmxsc, unsig
int error, n;
extern paddr_t avail_end;
struct rmem_pgrange *pgrp;
+#if !defined(__OpenBSD__)
#if 0
#define ISA_DMA_BOUNCE_THRESHOLD (16UL * 1024 * 1024)
#else
@@ -445,6 +447,7 @@ vmmon_alloc_low_pages(struct vmx86_softc *vmxsc, unsig
* So just use any pages we can get.
*/
#define ISA_DMA_BOUNCE_THRESHOLD (3072UL * 1024 * 1024)
+#endif
#endif
if (numPages == 0)

View File

@ -1,47 +0,0 @@
$OpenBSD: patch-source_vmmon_openbsd_host_c,v 1.2 2007/05/31 20:31:36 aanriot Exp $
--- source/vmmon/openbsd/host.c.orig Sun Mar 14 14:58:50 2004
+++ source/vmmon/openbsd/host.c Wed May 30 23:07:39 2007
@@ -59,6 +59,8 @@ lyaev Exp $
#include <sys/proc.h>
#include <machine/pio.h>
+#include <uvm/uvm_extern.h>
+#include <machine/pmap.h>
#include <uvm/uvm_extern.h>
#include <uvm/uvm_param.h>
@@ -153,14 +155,11 @@ int host_unlock_ppn(PPN ppn)
static INLINE MPN
HostifVa2Mpn(VA addr)
{
- pt_entry_t *pteptr = (pt_entry_t *)vtopte((vaddr_t)addr);
- PTE pte;
-
- pte = *pteptr;
- if (pte & PTE_P)
- return PTE_2_PFN(pte);
- else
+ paddr_t pa;
+ if (pmap_extract(vm_map_pmap(&curproc->p_vmspace->vm_map), addr, &pa)
+ == FALSE)
return 0;
+ return (pa >> PAGE_SHIFT);
}
/*
@@ -665,7 +664,6 @@ HostIF_UserToDriverPtr(VMDriver *vm, // IN
if (vm->crossvaddr != NULL)
Warning("KernelAddr already allocated\n");
- PHOLD(CURLWP);
uvm_vslock(curproc, addr, PAGE_SIZE,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
@@ -674,7 +672,6 @@ HostIF_UserToDriverPtr(VMDriver *vm, // IN
pmap_extract(vm_map_pmap(&curproc->p_vmspace->vm_map), uaddr, &paddr);
pmap_kenter_pa(kvaddr, paddr,
VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE);
- PRELE(CURLWP);
vm->crossvaddr = (void *)kvaddr;
vm->crossuaddr = addr;
#ifdef DEBUG

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-source_vmmon_uname_c,v 1.3 2005/03/07 18:15:09 todd Exp $
--- source/vmmon/openbsd/uname.c.orig Tue Jul 29 21:14:22 2003
+++ source/vmmon/openbsd/uname.c Wed Oct 6 10:47:30 2004
@@ -90,7 +90,6 @@ vmmon_linux_sys_uname(p, v, retval)
break;
}
if (pp == NULL) {
- printf("no match for pid %d\n", p->p_pid);
return (linux_sys_uname(p, v, retval));
}

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-source_vmnet_Makefile,v 1.3 2005/03/07 18:15:09 todd Exp $
--- source/vmnet/Makefile.orig 2003-07-26 16:07:47.000000000 -0500
+++ source/vmnet/Makefile 2003-09-13 22:57:42.000000000 -0500
@@ -1,6 +1,6 @@
MODOBJ= if_hub.o
-CFLAGS= -D_KERNEL -DNBPFILTER=1 -DINET -I/sys
+CFLAGS+= -D_KERNEL -DNBPFILTER=1 -DINET -I/sys
#-fno-stack-protector
SRCS= if_hubmod.c

View File

@ -1,62 +0,0 @@
$OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.3 2007/05/31 20:31:36 aanriot Exp $
--- source/vmnet/if_hubmod.c.orig Sun Mar 14 14:58:51 2004
+++ source/vmnet/if_hubmod.c Wed May 30 23:02:25 2007
@@ -399,7 +399,6 @@ port_mappoll(struct hubport_softc *portsc, vaddr_t uad
kpage = uvm_km_valloc_wait(kernel_map, PAGE_SIZE);
kaddr = kpage + off;
- PHOLD(CURLWP);
error = uvm_vslock(curproc, (void *)upage, PAGE_SIZE,
VM_PROT_READ|VM_PROT_WRITE);
if (error)
@@ -411,14 +410,12 @@ port_mappoll(struct hubport_softc *portsc, vaddr_t uad
#if 1
pmap_update(pmap_kernel());
#endif
- PRELE(CURLWP);
portsc->port_kpollpage = kpage;
portsc->port_upollpage = upage;
portsc->port_pollptr = (u_int32_t *)kaddr;
return 0;
err:
- PRELE(CURLWP);
uvm_km_free_wakeup(kernel_map, kpage, PAGE_SIZE);
return (error);
}
@@ -431,9 +428,7 @@ port_unmappoll(struct hubport_softc *portsc)
pmap_update(pmap_kernel());
#endif
uvm_km_free_wakeup(kernel_map, portsc->port_kpollpage, PAGE_SIZE);
- PHOLD(CURLWP);
uvm_vsunlock(curproc, (void *)portsc->port_upollpage, PAGE_SIZE);
- PRELE(CURLWP);
portsc->port_pollptr = NULL;
portsc->port_kpollpage = 0;
portsc->port_upollpage = 0;
@@ -604,6 +599,7 @@ hub_fake_clonedev(dev_t dev, int flag, struct proc *p)
#endif
p->p_dupfd = fd;
+ p->p_descfd = p->p_dupfd; /* XXX */
return ENXIO;
}
@@ -651,7 +647,7 @@ hub_sendchain(struct hubport_softc *portsc, struct mbu
*/
#if NBPFILTER > 0
if (ifp2->if_bpf)
- bpf_mtap(ifp2->if_bpf, m2);
+ bpf_mtap(ifp2->if_bpf, m2, BPF_DIRECTION_OUT);
#endif
s = splnet();
drops1 = ifp2->if_snd.ifq_drops;
@@ -732,7 +728,7 @@ hub_ifstart(struct ifnet *ifp)
hub_sendchain(portsc, m);
#if NBPFILTER > 0
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m);
+ bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT);
#endif
m_freem(m);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-util_vmware-run_c,v 1.3 2005/03/07 18:15:09 todd Exp $
--- util/vmware-run.c.orig 2003-08-08 14:42:51.000000000 -0600
+++ util/vmware-run.c 2003-10-14 00:47:05.000000000 -0600
@@ -15,7 +15,7 @@ main(int argc, char **argv)
{
int fd;
- argv[0] = "/usr/local/bin/vmware";
+ argv[0] = "_PREFIX_/lib/vmware/bin/vmware";
fd = open("/dev/vmmon", O_RDWR, 0);
if (fd == -1)

View File

@ -1,12 +0,0 @@
VMware is a proprietary/commercial x86 machine emulator.
Only a small part of the code base was made available, but it
was enough to get this port working on OpenBSD.
However, Version 3 is past its End Of Life with the supplier,
so you cannot buy licenses for it from vmware.com (dont even ask
them or the port maintainer).
You MUST either have a VMware V3 license already, or find one on
eBay or elsewhere, before you can use this product.
You should also consider the non-proprietary emulators such as
qemu and bochs (which are in ports) among others.

View File

@ -1,322 +0,0 @@
@comment $OpenBSD: PLIST,v 1.3 2005/03/07 18:15:09 todd Exp $
bin/vmnet-netifup
bin/vmware
bin/vmware-modules
lib/vmware/
lib/vmware/bin/
lib/vmware/bin/update
lib/vmware/bin/vmware
lib/vmware/bin/vmware-mks
lib/vmware/bin/vmware-run
lib/vmware/bin/vmware-ui
lib/vmware/configurator/
lib/vmware/configurator/vmnet-dhcpd.conf
lib/vmware/configurator/vmnet-nat.conf
lib/vmware/configurator/vmnet-smb.conf
lib/vmware/help/
lib/vmware/help/CUSTOM-NETWORK.gif
lib/vmware/help/ConfigWiz.htm
lib/vmware/help/FullScreen.gif
lib/vmware/help/Help.gif
lib/vmware/help/PowerOff.gif
lib/vmware/help/PowerOn.gif
lib/vmware/help/PowerReset.gif
lib/vmware/help/Resume.gif
lib/vmware/help/Suspend.gif
lib/vmware/help/Wizcd.htm
lib/vmware/help/Wizcongrats.htm
lib/vmware/help/Wizdisk.htm
lib/vmware/help/Wizdisk3.htm
lib/vmware/help/WizdiskType.htm
lib/vmware/help/Wizfloppy.htm
lib/vmware/help/Wizguestkit.htm
lib/vmware/help/Wiznetwork.htm
lib/vmware/help/Wizos.htm
lib/vmware/help/Wizpath.htm
lib/vmware/help/about_this_help.htm
lib/vmware/help/commandref_linux.htm
lib/vmware/help/config_editor.htm
lib/vmware/help/config_editor_newvm.htm
lib/vmware/help/configvm.htm
lib/vmware/help/configvm_adv.htm
lib/vmware/help/configvm_automation.htm
lib/vmware/help/configvm_debug.htm
lib/vmware/help/configvm_disableaccel.htm
lib/vmware/help/configvm_display-problems.htm
lib/vmware/help/configvm_displayname.htm
lib/vmware/help/configvm_guestos.htm
lib/vmware/help/configvm_logs.htm
lib/vmware/help/configvm_memory.htm
lib/vmware/help/configvm_options.htm
lib/vmware/help/configvm_state.htm
lib/vmware/help/configvm_virtualdisk.htm
lib/vmware/help/configvmware-disablemem.htm
lib/vmware/help/configvmware-inputgrab.htm
lib/vmware/help/configvmware-maxmemory.htm
lib/vmware/help/configvmware-shift.htm
lib/vmware/help/configvmware.htm
lib/vmware/help/configvmware_copy_paste.htm
lib/vmware/help/devices.htm
lib/vmware/help/devices_autostart.htm
lib/vmware/help/devices_cdrom-changeconnect.htm
lib/vmware/help/devices_cdrom-disable.htm
lib/vmware/help/devices_cdrom-issues-linux.htm
lib/vmware/help/devices_cdrom-issues.htm
lib/vmware/help/devices_cdrom-removable.htm
lib/vmware/help/devices_cdrom-remove.htm
lib/vmware/help/devices_cdrom.htm
lib/vmware/help/devices_floppy.htm
lib/vmware/help/devices_floppy_changeconnect.htm
lib/vmware/help/devices_genscsi.htm
lib/vmware/help/devices_genscsi_linux.htm
lib/vmware/help/devices_modem.htm
lib/vmware/help/devices_mouse.htm
lib/vmware/help/devices_netadapter.htm
lib/vmware/help/devices_parallel-info.htm
lib/vmware/help/devices_parallel-onguestos.htm
lib/vmware/help/devices_parallel.htm
lib/vmware/help/devices_parallel_changeconnect.htm
lib/vmware/help/devices_pcmcia.htm
lib/vmware/help/devices_plaindisk-info.htm
lib/vmware/help/devices_plaindisk.htm
lib/vmware/help/devices_printer.htm
lib/vmware/help/devices_rawdisk.htm
lib/vmware/help/devices_remove_netadapter.htm
lib/vmware/help/devices_scanner.htm
lib/vmware/help/devices_scsi-bios.htm
lib/vmware/help/devices_scsi-guestos.htm
lib/vmware/help/devices_scsi.htm
lib/vmware/help/devices_scsi_info.htm
lib/vmware/help/devices_scsi_vs-ide.htm
lib/vmware/help/devices_serial.htm
lib/vmware/help/devices_sound-issues.htm
lib/vmware/help/devices_sound.htm
lib/vmware/help/devices_sound_changeconn.htm
lib/vmware/help/devices_usb-info.htm
lib/vmware/help/devices_usb.htm
lib/vmware/help/devices_video-linux-res.htm
lib/vmware/help/devices_video-linux.htm
lib/vmware/help/devices_video-win2000.htm
lib/vmware/help/devices_video-win95.htm
lib/vmware/help/devices_video-win98.htm
lib/vmware/help/devices_virtualdrive-consolidate.htm
lib/vmware/help/devices_virtualdrive-diskmode.htm
lib/vmware/help/devices_virtualdrive-virtualdisk-physical.htm
lib/vmware/help/devices_virtualdrive-virtualdisk-reuse.htm
lib/vmware/help/devices_virtualdrive-virtualdisk.htm
lib/vmware/help/devices_virtualdrive.htm
lib/vmware/help/devices_zipdrive.htm
lib/vmware/help/glossary.htm
lib/vmware/help/grab.htm
lib/vmware/help/guestos-corellinux.htm
lib/vmware/help/guestos-dos.htm
lib/vmware/help/guestos-freebsd.htm
lib/vmware/help/guestos-kit.htm
lib/vmware/help/guestos-mandrake-linux.htm
lib/vmware/help/guestos-mandrake-linux8081.htm
lib/vmware/help/guestos-mandrake-linux82.htm
lib/vmware/help/guestos-novell-4.htm
lib/vmware/help/guestos-novell-5.htm
lib/vmware/help/guestos-novell-6.htm
lib/vmware/help/guestos-novell-zenwrks.htm
lib/vmware/help/guestos-openlinux.htm
lib/vmware/help/guestos-rawdisk.htm
lib/vmware/help/guestos-redhat-linux.htm
lib/vmware/help/guestos-redhat-linux6.x.htm
lib/vmware/help/guestos-redhat-linux7.0.htm
lib/vmware/help/guestos-redhat-linux7.1.htm
lib/vmware/help/guestos-redhat-linux7.3.htm
lib/vmware/help/guestos-solaris7.htm
lib/vmware/help/guestos-suse-linux-6.x.htm
lib/vmware/help/guestos-suse-linux-7.0.htm
lib/vmware/help/guestos-suse-linux-7.1.htm
lib/vmware/help/guestos-suse-linux-8.0.htm
lib/vmware/help/guestos-suse-linux.htm
lib/vmware/help/guestos-turbolinux-6.0.htm
lib/vmware/help/guestos-turbolinux-7.0.htm
lib/vmware/help/guestos-turbolinux.htm
lib/vmware/help/guestos-win2000.htm
lib/vmware/help/guestos-win95.htm
lib/vmware/help/guestos-win98.htm
lib/vmware/help/guestos-winNETSvr.htm
lib/vmware/help/guestos-winXP.htm
lib/vmware/help/guestos-winme.htm
lib/vmware/help/guestos-winnt.htm
lib/vmware/help/guestos.htm
lib/vmware/help/hotkey.htm
lib/vmware/help/image001.gif
lib/vmware/help/index.htm
lib/vmware/help/install_apps.htm
lib/vmware/help/introduction.htm
lib/vmware/help/keyboard_issus.htm
lib/vmware/help/lock_files.htm
lib/vmware/help/memory.htm
lib/vmware/help/migratevm-toupgrade.htm
lib/vmware/help/migratevm-uninstall.htm
lib/vmware/help/migratevm-upgrade.htm
lib/vmware/help/migratevm.htm
lib/vmware/help/migratevm_buildno.htm
lib/vmware/help/migratevm_pc.htm
lib/vmware/help/migrating.htm
lib/vmware/help/movefiles.htm
lib/vmware/help/networking-components.htm
lib/vmware/help/networking-onguestos.htm
lib/vmware/help/networking-onhost.htm
lib/vmware/help/networking-promiscuous.htm
lib/vmware/help/networking.htm
lib/vmware/help/networking_assignip.htm
lib/vmware/help/networking_bridged-onguestos.htm
lib/vmware/help/networking_bridged-second.htm
lib/vmware/help/networking_bridged.htm
lib/vmware/help/networking_changing.htm
lib/vmware/help/networking_custom.htm
lib/vmware/help/networking_host-onguestos.htm
lib/vmware/help/networking_host-twointerfaces.htm
lib/vmware/help/networking_host.htm
lib/vmware/help/networking_host_ipleaks.htm
lib/vmware/help/networking_host_issues-linux.htm
lib/vmware/help/networking_host_routing.htm
lib/vmware/help/networking_host_samba.htm
lib/vmware/help/networking_ipmasqerade.htm
lib/vmware/help/networking_ipmasqerade_firewallrh.htm
lib/vmware/help/networking_ipmasqerade_fwconfig.htm
lib/vmware/help/networking_macaddr.htm
lib/vmware/help/networking_nat.htm
lib/vmware/help/networking_nat_intro.htm
lib/vmware/help/networking_proxy.htm
lib/vmware/help/networking_wireless.htm
lib/vmware/help/newvm-diskpartition.htm
lib/vmware/help/newvm-diskpartition_access.htm
lib/vmware/help/newvm-diskpartition_hide.htm
lib/vmware/help/newvm-dualboot-hdwr.htm
lib/vmware/help/newvm-dualboot-scsi.htm
lib/vmware/help/newvm-dualboot.htm
lib/vmware/help/newvm-virtualdisk.htm
lib/vmware/help/newvm.htm
lib/vmware/help/newvm_wizard.htm
lib/vmware/help/newvm_wizard_process_cdrom.htm
lib/vmware/help/newvm_wizard_process_directory.htm
lib/vmware/help/newvm_wizard_process_disksize.htm
lib/vmware/help/newvm_wizard_process_disktype.htm
lib/vmware/help/newvm_wizard_process_floppy.htm
lib/vmware/help/newvm_wizard_process_guestos.htm
lib/vmware/help/newvm_wizard_process_network.htm
lib/vmware/help/perform-guestos-linux.htm
lib/vmware/help/perform-guestos-win2000.htm
lib/vmware/help/perform-guestos-win95-98.htm
lib/vmware/help/perform-linuxhost.htm
lib/vmware/help/perform.htm
lib/vmware/help/screensavers.htm
lib/vmware/help/serialnumber.htm
lib/vmware/help/sharefiles_hos_gos.htm
lib/vmware/help/sharevm.htm
lib/vmware/help/sizewin.htm
lib/vmware/help/sizewin_fullscreen.htm
lib/vmware/help/startvm.htm
lib/vmware/help/startvmware.htm
lib/vmware/help/statevm.htm
lib/vmware/help/statevm_off.htm
lib/vmware/help/statevm_on.htm
lib/vmware/help/statevm_repeat_resume.htm
lib/vmware/help/statevm_reset.htm
lib/vmware/help/statevm_resume.htm
lib/vmware/help/statevm_suspend.htm
lib/vmware/help/support.htm
lib/vmware/help/switching.htm
lib/vmware/help/sysreqs.htm
lib/vmware/help/toc.htm
lib/vmware/help/user-permissions-linux.htm
lib/vmware/help/vm_common.htm
lib/vmware/help/vmtools-copypaste.htm
lib/vmware/help/vmtools-defrag.htm
lib/vmware/help/vmtools-shrink.htm
lib/vmware/help/vmtools.htm
lib/vmware/help/vmtools_install.htm
lib/vmware/help/vmtools_install_freebsd.htm
lib/vmware/help/vmtools_install_linux.htm
lib/vmware/help/vmtools_install_win.htm
lib/vmware/help/vmtools_prefs.htm
lib/vmware/help/whatsnew.htm
lib/vmware/isoimages/
lib/vmware/isoimages/freebsd.iso
lib/vmware/isoimages/linux.iso
lib/vmware/isoimages/windows.iso
lib/vmware/licenses/
lib/vmware/licenses/site/
lib/vmware/licenses/user/
lib/vmware/messages/
lib/vmware/messages/chef/
lib/vmware/messages/chef/vmware-mks.vmsg
lib/vmware/messages/chef/vmware-ui.vmsg
lib/vmware/messages/chef/vmware.vmsg
lib/vmware/messages/ja/
lib/vmware/messages/ja/vmware-mks.vmsg
lib/vmware/messages/ja/vmware-ui.vmsg
lib/vmware/messages/ja/vmware.vmsg
lib/vmware/messages/jive/
lib/vmware/messages/jive/vmware-mks.vmsg
lib/vmware/messages/jive/vmware-ui.vmsg
lib/vmware/messages/jive/vmware.vmsg
lib/vmware/modules/
lib/vmware/modules/if_hub.o
lib/vmware/modules/linuxrtc.o
lib/vmware/modules/vmmon.o
lib/vmware/smb/
lib/vmware/smb/codepages/
lib/vmware/smb/codepages/codepage.437
lib/vmware/smb/codepages/codepage.737
lib/vmware/smb/codepages/codepage.850
lib/vmware/smb/codepages/codepage.852
lib/vmware/smb/codepages/codepage.861
lib/vmware/smb/codepages/codepage.866
lib/vmware/smb/codepages/codepage.932
lib/vmware/smb/codepages/codepage.936
lib/vmware/smb/codepages/codepage.949
lib/vmware/smb/codepages/codepage.950
lib/vmware/xkeymap/
lib/vmware/xkeymap/be101
lib/vmware/xkeymap/be104
lib/vmware/xkeymap/chde101
lib/vmware/xkeymap/chde104
lib/vmware/xkeymap/chfr101
lib/vmware/xkeymap/chfr104
lib/vmware/xkeymap/de101
lib/vmware/xkeymap/de104
lib/vmware/xkeymap/dk101
lib/vmware/xkeymap/dk104
lib/vmware/xkeymap/es101
lib/vmware/xkeymap/es104
lib/vmware/xkeymap/fi101
lib/vmware/xkeymap/fi104
lib/vmware/xkeymap/fr101
lib/vmware/xkeymap/fr104
lib/vmware/xkeymap/gb101
lib/vmware/xkeymap/gb104
lib/vmware/xkeymap/is101
lib/vmware/xkeymap/is104
lib/vmware/xkeymap/it101
lib/vmware/xkeymap/it104
lib/vmware/xkeymap/jp106
lib/vmware/xkeymap/jp109
lib/vmware/xkeymap/no101
lib/vmware/xkeymap/no104
lib/vmware/xkeymap/pt101
lib/vmware/xkeymap/pt104
lib/vmware/xkeymap/se101
lib/vmware/xkeymap/se104
lib/vmware/xkeymap/us101
lib/vmware/xkeymap/us104
libexec/vmware-linuxrtc_load.sh
libexec/vmware-linuxrtc_unload.sh
libexec/vmware-vmmon_load.sh
libexec/vmware-vmmon_unload.sh
libexec/vmware-vmnet_load.sh
libexec/vmware-vmnet_unload.sh
share/doc/vmware/
share/doc/vmware/README.NetBSD
share/doc/vmware/README.OpenBSD
share/doc/vmware/README.OpenBSD.Modules
share/examples/vmware/
@sample /etc/vmware/
share/examples/vmware/config
@sample /etc/vmware/config

View File

@ -1,22 +0,0 @@
# $OpenBSD: systrace.policy,v 1.2 2006/10/19 00:15:36 sturm Exp $
Policy: ${WRKDIR}/vmware-openbsd/vmware-any-any-update37/update, Emulation: linux
linux-brk: permit
linux-close: permit
linux-exit: permit
linux-linux_exit_group: permit
linux-fsread: permit
linux-fstat64: permit
linux-fswrite: filename match "${WRKDIR}" then permit
linux-getegid: permit
linux-geteuid: permit
linux-getgid: permit
linux-getuid: permit
linux-ioctl: permit
linux-lseek: permit
linux-mmap: permit
linux-mprotect: permit
linux-munmap: permit
linux-read: permit
linux-uname: permit
linux-write: permit
linux-writev: permit