Initial commit of vmware 3.2.0. This first version is CURRENT 5.x

only.

17 files changed, 10 insertions, 1065 deletions

diff --git a/emulators/vmware3/files/Makefile b/emulators/vmware3/files/Makefile
index 73c7bbd4ac41..07e91ff423a4 100644
--- a/emulators/vmware3/files/Makefile
+++ b/emulators/vmware3/files/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	vmmon-only
+SUBDIR=	vmmon-only vmnet-only
 
 .include <bsd.subdir.mk>
diff --git a/emulators/vmware3/files/Makefile.vmmon b/emulators/vmware3/files/Makefile.vmmon
index ad418ac981a8..324311e69ae0 100644
--- a/emulators/vmware3/files/Makefile.vmmon
+++ b/emulators/vmware3/files/Makefile.vmmon
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-MAKE_SMP=	make -f Makefile.FreeBSD SMP=YES
-MAKE_UP=	make -f Makefile.FreeBSD SMP=NO
+MAKE_SMP=	make -f Makefile.freebsd SMP=YES
+MAKE_UP=	make -f Makefile.freebsd SMP=NO
 
 all:	
 	${MAKE_SMP} clean && ${MAKE_SMP}
diff --git a/emulators/vmware3/files/Makefile.vmnet b/emulators/vmware3/files/Makefile.vmnet
new file mode 100644
index 000000000000..dda7ba04e52d
--- /dev/null
+++ b/emulators/vmware3/files/Makefile.vmnet
@@ -0,0 +1,5 @@
+# $FreeBSD: /tmp/pcvs/ports/emulators/vmware3/files/Attic/Makefile.vmnet,v 1.1 2003-04-13 02:59:11 mbr Exp $
+
+SUBDIR= freebsd
+
+.include <bsd.subdir.mk>
diff --git a/emulators/vmware3/files/cdevsw.patch b/emulators/vmware3/files/cdevsw.patch
deleted file mode 100644
index e8f15423009a..000000000000
--- a/emulators/vmware3/files/cdevsw.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- vmmon-only/freebsd/driver.c_original	Wed Mar  5 19:22:35 2003
-+++ vmmon-only/freebsd/driver.c	Wed Mar  5 19:22:44 2003
-@@ -155,6 +155,14 @@
- 
- /* static struct cdevsw vmmon_cdevsw = { */
- static struct cdevsw vmmon_cdevsw = {
-+#if __FreeBSD_version >= 500104
-+	.d_open =	FreeBSD_Driver_Open,
-+	.d_close =	FreeBSD_Driver_Close,
-+	.d_ioctl =	FreeBSD_Driver_Ioctl,
-+	.d_poll =	FreeBSD_Driver_Poll,
-+	.d_name =	DEVICE_NAME,
-+	.d_maj =	CDEV_MAJOR
-+#else
- 	/* open */	FreeBSD_Driver_Open,
- 	/* close */	FreeBSD_Driver_Close,
- 	/* read */	noread,
-@@ -169,8 +177,7 @@
- 	/* psize */	nopsize,
- 	/* flags */	0,
- 	/* bmaj */	-1
--
--
-+#endif
- };
- 
- 
-@@ -242,7 +249,11 @@
-    sprintf(freebsdState.deviceBuf,DEVICE_NAME);
-    freebsdState.major = CDEV_MAJOR;
-    freebsdState.minor = CDEV_MINOR;
-+#if __FreeBSD_version < 500104
-    retval = cdevsw_add(&vmmon_cdevsw);
-+#else
-+   retval = 0;
-+#endif
- 
- #endif
-    if (retval) {
-@@ -273,12 +284,14 @@
-    int retval=0;
-    
-    destroy_dev(vmmon_dev);
-+#if __FreeBSD_version < 500104
-    retval = cdevsw_remove(&vmmon_cdevsw);
-    if (retval) {
-       Warning("Module %s: error unregistering\n", freebsdState.deviceBuf);
-    } else {
-       Log("Module %s: unloaded\n", freebsdState.deviceBuf);
-    }
-+#endif
- 	
-    return 0;
- }
---- vmnet-only/freebsd/vmnet.c_original	Wed Mar  5 19:21:51 2003
-+++ vmnet-only/freebsd/vmnet.c	Wed Mar  5 19:22:00 2003
-@@ -103,6 +103,16 @@
- static int vmnet_modeevent(module_t mod, int cmd, void *arg);
- 
- static struct cdevsw vmnet_cdevsw = {
-+#if __FreeBSD_version >= 500104
-+	.d_open = 	vmnet_open,
-+	.d_close = 	vmnet_close,
-+	.d_read = 	vmnet_read,
-+	.d_write = 	vmnet_write,
-+	.d_ioctl = 	vmnet_ioctl,
-+	.d_poll = 	vmnet_poll,
-+	.d_name = 	DEVICE_NAME,
-+	.d_maj = 	CDEV_MAJOR
-+#else
- 	/* open */	vmnet_open,
- 	/* close */	vmnet_close,
- 	/* read */	vmnet_read,
-@@ -115,10 +125,11 @@
- 	/* maj */	CDEV_MAJOR,
- 	/* dump */	nodump,
- 	/* psize */	nopsize,
--	/* flags */	0,
--	/* bmaj */	-1
-+	/* flags */	0, -/* bmaj */	-1
-+#endif
- };
- 
-+
- /* 
-  * Now declare the module to the system. 
-  * IMPORTANT: Must be before netgraph node declaration.
-@@ -164,7 +175,7 @@
- 
- 	s = splimp();
- 	if_attach(ifp);
--	ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
-+	ether_ifattach(ifp);
- 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
- 	splx(s);
- 	
-@@ -604,11 +615,13 @@
- static int
- init_module(void)
- {
--int error;
-+	int error = 0;
- 
-+#if __FreeBSD_version < 500104
-    	error = cdevsw_add(&vmnet_cdevsw);
- 	if (error) 
- 		return error;
-+#endif
- 
- 	return error;
- }
-@@ -618,7 +631,7 @@
- static int
- cleanup_module(void)
- {
--	int error;
-+	int error = 0;
- 	struct vmnet_softc *sc;
- 
- 	DLog(Lenter, "");
-@@ -629,7 +642,9 @@
- 			return error;
- 		}
-    	}
-+#if __FreeBSD_version < 500104
- 	error = cdevsw_remove(&vmnet_cdevsw);
-+#endif
- 	DLog(Linfo, "return %d", error);
- 	return error;
- }
diff --git a/emulators/vmware3/files/filedesc.patch b/emulators/vmware3/files/filedesc.patch
deleted file mode 100644
index 8c625917bd9d..000000000000
--- a/emulators/vmware3/files/filedesc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- vmnet-only/freebsd/vmnet_linux.c.orig	Tue Feb 11 22:12:40 2003
-+++ vmnet-only/freebsd/vmnet_linux.c	Tue Feb 11 22:25:20 2003
-@@ -32,6 +32,7 @@
- #include <sys/socket.h>
- #include <sys/proc.h>
- #include <sys/file.h>
-+#include <sys/filedesc.h>
- 
- #include <net/if.h>
- 
---- vmmon-only/freebsd/driver.c.orig	Tue Feb 11 22:12:39 2003
-+++ vmmon-only/freebsd/driver.c	Tue Feb 11 22:22:35 2003
-@@ -45,8 +45,9 @@
- #include <sys/kernel.h>
- #include <sys/module.h>
- #include <sys/conf.h>
- #include <sys/selinfo.h>
- #include <sys/fcntl.h>
-+#include <sys/filedesc.h>
- #include <sys/malloc.h>
- #include <sys/proc.h>
- #include <sys/ioccom.h>
---- vmmon-only/freebsd/linux_emu.c.orig	Tue Feb 11 22:12:40 2003
-+++ vmmon-only/freebsd/linux_emu.c	Tue Feb 11 22:24:42 2003
-@@ -36,6 +36,7 @@
- #include <sys/disklabel.h>
- #include <sys/cdio.h>
- #include <sys/file.h>
-+#include <sys/filedesc.h>
- #include <sys/selinfo.h>
- 
- #include <sys/fdcio.h>
diff --git a/emulators/vmware3/files/fo_ioctl.patch b/emulators/vmware3/files/fo_ioctl.patch
deleted file mode 100644
index 6cfde2c4c06f..000000000000
--- a/emulators/vmware3/files/fo_ioctl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- vmmon-only/freebsd/linux_emu.c	Tue Aug 20 12:40:02 2002
-+++ vmmon-only/freebsd/linux_emu.c	Tue Aug 20 12:42:23 2002
-@@ -306,7 +306,7 @@
- 	struct linux_floppy_struct fls;
- 	struct fd_type fdt;
- 
--	if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, td)) != 0)
-+	if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, td->td_ucred, td)) != 0)
- 	    return error;
- 	bzero(&fls, sizeof(fls));
- 	
-@@ -330,7 +330,7 @@
- 	struct linux_hd_geometry drive_geo;
- 	struct disklabel dl;
- 	
--	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
-+	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td->td_ucred, td)) != 0)
- 	    return error;
- 
- 	bzero(&drive_geo, sizeof(drive_geo));
-@@ -351,7 +351,7 @@
- 	struct linux_hd_driveid driveid;
- 	unsigned int capacity;
- 
--	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
-+	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td->td_ucred, td)) != 0)
- 	    return error;
- 
- 	bzero(&driveid, sizeof(driveid));
-@@ -388,7 +388,7 @@
- 	struct ioc_vol bsd_vol;
- 	struct linux_cdrom_volctrl linux_vol;
- 
--	if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, td)) != 0)
-+	if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, td->td_ucred, td)) != 0)
- 	    return error;
- 
- 	linux_vol.channel0 = bsd_vol.vol[0];
-@@ -411,7 +411,7 @@
- 	if ((error = copyin(muls, &ms, sizeof(ms))) != 0)
- 	    return error;
- 
--	if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, td)) != 0)
-+	if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, td->td_ucred, td)) != 0)
- 	    return error;
- 	
- 	bzero(&t, sizeof(t));
-@@ -419,7 +419,7 @@
- 	t.address_format = ms.addr_format ; /* BSD and LINUX formats equal */
- 	t.track = 0; /* get content from the first track */
- 
--	if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, td)) != 0) 
-+	if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, td->td_ucred, td)) != 0) 
- 	    return error;
- 	    
- 	bsd_to_linux_msf_lba(ms.addr_format, &t.entry.addr, &ms.addr);
---- vmnet-only/freebsd/vmnet_linux.c	Tue Aug 20 12:40:02 2002
-+++ vmnet-only/freebsd/vmnet_linux.c	Tue Aug 20 12:42:59 2002
-@@ -90,7 +90,7 @@
- 
-     switch (macAddr.version) {
- 	case 1:
--	  error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, td);
-+	  error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, td->td_ucred, td);
- 	  DEB(printf("Get ethernet address: %6D\n", macAddr.addr, ":"));
- 	  break;
- 	default:
diff --git a/emulators/vmware3/files/hostif_c.patch b/emulators/vmware3/files/hostif_c.patch
deleted file mode 100644
index 58499ba714d3..000000000000
--- a/emulators/vmware3/files/hostif_c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmmon-only/freebsd/hostif.c.patched	Tue Apr  8 15:15:20 2003
-+++ vmmon-only/freebsd/hostif.c	Tue Apr  8 15:16:21 2003
-@@ -183,7 +183,7 @@
- {
- #define DEB(x) 
-    caddr_t addr = (caddr_t)VPN_2_VA(ppn);
--   pt_entry_t *pteptr = vtopte(addr);
-+   pt_entry_t *pteptr = vtopte((vm_offset_t)addr);
-    PTE pte;
- 
-    DEB(printf("FindMPN: for page %d address %p(phys %p) pteptr %p", ppn, addr, (caddr_t)vtophys(addr), pteptr));
diff --git a/emulators/vmware3/files/kmoddeps.patch b/emulators/vmware3/files/kmoddeps.patch
deleted file mode 100644
index e282d8c20ff4..000000000000
--- a/emulators/vmware3/files/kmoddeps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vmmon-only/Makefile.FreeBSD.orig	Fri Jun 14 08:45:33 2002
-+++ vmmon-only/Makefile.FreeBSD	Fri Jun 14 08:47:42 2002
-@@ -40,7 +40,9 @@
- SRCS=		
- 
- # For 4.0-STABLE
-+.if ${OSVERSION} < 500002
- KMODDEPS=	linux
-+.endif
- 
- INCLUDE = -I$(.CURDIR)/include -I$(.CURDIR)/common -I$(.CURDIR)/freebsd -I$(.CURDIR)/export/include -I/sys
- INCLUDE += -I$(.CURDIR)/../vmnet-only/freebsd/
diff --git a/emulators/vmware3/files/kse.patch b/emulators/vmware3/files/kse.patch
deleted file mode 100644
index f4e611e6ee2a..000000000000
--- a/emulators/vmware3/files/kse.patch
+++ /dev/null
@@ -1,581 +0,0 @@
---- ./vmmon-only/common/vmx86.c.orig	Sat Nov 10 16:54:14 2001
-+++ ./vmmon-only/common/vmx86.c	Sat Nov 10 16:55:02 2001
-@@ -51,6 +51,7 @@
- 
- 
- static VMDriver *vmDriverList = NULL;
-+VMDriver * Vmx86_CurrentVM(void *uniqHandle);
- 
- static int32 lockedPageLimit;
- static int32 numLockedPages;
---- ./vmmon-only/freebsd/driver.c.orig	Sat Nov 10 16:54:17 2001
-+++ ./vmmon-only/freebsd/driver.c	Sat Nov 10 16:54:52 2001
-@@ -147,6 +147,8 @@
- #endif
- 
- #define CDEV_MINOR 0
-+
-+/* static struct cdevsw vmmon_cdevsw = { */
- static struct cdevsw vmmon_cdevsw = {
- 	/* open */	FreeBSD_Driver_Open,
- 	/* close */	FreeBSD_Driver_Close,
-@@ -162,8 +164,12 @@
- 	/* psize */	nopsize,
- 	/* flags */	0,
- 	/* bmaj */	-1
-+
-+
- };
- 
-+
-+
- /*
-  *----------------------------------------------------------------------
-  *
-@@ -329,7 +335,7 @@
-  *----------------------------------------------------------------------
-  */
- static int 
--FreeBSD_Driver_Open(dev_t dev, int oflag, int devtype, struct proc *p)
-+FreeBSD_Driver_Open(dev_t dev, int oflag, int devtype, struct thread *td)
- {
-    VMFreeBSD *vmFreeBSD;
-    VMDriver *vm;
-@@ -353,7 +359,7 @@
-    }
-    memset(vmFreeBSD, 0, sizeof *vmFreeBSD);
-    
--   vm = Vmx86_Init((void *)dev, (void *)(p->p_pid));
-+   vm = Vmx86_Init((void *)dev, (void *)(td->td_proc->p_pid));
-    if (vm == NULL) {
-       Warning("Vmx86_Init failed\n");
-       free(vmFreeBSD, M_DEVBUF);
-@@ -409,7 +415,7 @@
-  */
- 
- static int
--FreeBSD_Driver_Close(dev_t dev, int fflag, int devtype, struct proc *p)
-+FreeBSD_Driver_Close(dev_t dev, int fflag, int devtype, struct thread *td)
- {
-    VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
- 
-@@ -419,7 +425,7 @@
- 
-    if (!vmFreeBSD->vm) { 
-       printf("/dev/" DEVICE_NAME ": (zombie) close fd for pid=%d\n",
--             p->p_pid);
-+             td->td_proc->p_pid);
-    } else {
-       /*printf("/dev/" DEVICE_NAME ": useCount DEC pid=%d\n",vmFreeBSD->pids[0]);*/
-    }
-@@ -461,7 +467,7 @@
-  */
- 
- static int 
--FreeBSD_Driver_Poll(dev_t dev, int events, struct proc *p)
-+FreeBSD_Driver_Poll(dev_t dev, int events, struct thread *td)
- {
-    int revents = 0;
- 
-@@ -492,7 +498,7 @@
- #if POLL_TRACE
-       nanotime(&vmFreeBSD->time_sleep);
- #endif
--      selrecord(p, &vmFreeBSD->rsel);
-+      selrecord(td, &vmFreeBSD->rsel);
-       vmFreeBSD->flags.twaiting = TRUE;
-       vmFreeBSD->thandle = timeout(FreeBSD_DriverSelectTimeout, vmFreeBSD, 1);
-    }
-@@ -544,7 +550,7 @@
-  */
- static int 
- FreeBSD_Driver_Ioctl( dev_t dev, u_long cmd, caddr_t parg, int mode, 
--		      struct proc *p)
-+		      struct thread *td)
- {
-    VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
-    VMDriver *vm = vmFreeBSD->vm;
-@@ -575,7 +581,7 @@
-       ASSERT(!err);
-       err = Vmx86_CreateVM(vm, &initParams);
-       if (err) { 
--	 p->p_retval[0] = -1;
-+	 td->td_retval[0] = -1;
- 	 retval = EAGAIN;
-       }
-       err = HostIF_CopyToUser((char*)arg,&initParams,sizeof(InitBlock));
-@@ -591,7 +597,7 @@
-    case VMIO_RUN:
-       ASSERT(vm != NULL);
-       vm_hold = vm;
--      p->p_retval[0] = Vmx86_RunVM(vm);
-+      td->td_retval[0] = Vmx86_RunVM(vm);
-       break;
- 
-    case VMIO_BEEP: { /* XXX for buggy Linux */
-@@ -625,7 +631,7 @@
-      char *addr = (char *)arg;
-      MPN mpn;
-      mpn = HostIF_LookupUserMPN(vm,addr);
--     p->p_retval[0] = mpn;
-+     td->td_retval[0] = mpn;
-      break;
-    }
-    
-@@ -633,18 +639,18 @@
-       char *addr = (char *)arg;
-       MPN mpn;
-       mpn = Vmx86_LockPage(vm, addr, TRUE);
--      p->p_retval[0] = mpn;
-+      td->td_retval[0] = mpn;
-       break;
-    }
-    
-    case VMIO_UNLOCKPAGE: { 
-       char *addr = (char *)arg;
--      p->p_retval[0] = Vmx86_UnlockPage(vm, addr, TRUE);
-+      td->td_retval[0] = Vmx86_UnlockPage(vm, addr, TRUE);
-       break;
-    }
- 
-    case VMIO_GET_NUM_VMS : {
--      p->p_retval[0] = Vmx86_GetNumVMs();
-+      td->td_retval[0] = Vmx86_GetNumVMs();
-       break;
-    }
-       
-@@ -660,7 +666,7 @@
-    }
- 
-    case VMIO_GET_HARD_LIMIT: {
--      p->p_retval[0] = Vmx86_GetLockedPagesLimit();
-+      td->td_retval[0] = Vmx86_GetLockedPagesLimit();
-       break;
-    }
- 
-@@ -762,9 +768,9 @@
-       
-    case VMIO_ISMPSAFE : { 
- #ifdef SMP
--      p->p_retval[0] = TRUE;
-+      td->td_retval[0] = TRUE;
- #else
--      p->p_retval[0] = FALSE;
-+      td->td_retval[0] = FALSE;
- #endif
-       break;
-    }
-@@ -772,25 +778,25 @@
-    case VMIO_APICBASE: { 
-       MA ma;
-       ma = HostIF_APIC_Base(vm, (Bool)arg);
--      p->p_retval[0] = ma;
-+      td->td_retval[0] = ma;
-       break;
-    }
-    
-    case VMIO_IOAPICBASE: { 
-       MA ma;
-       ma = HostIF_IOAPIC_Base(vm);
--      p->p_retval[0] = ma;
-+      td->td_retval[0] = ma;
-       break;
-    }
- 
-    
-    case VMIO_CHECK_MEMORY : 
--      p->p_retval[0] = HostIF_CheckMemory(vm);
-+      td->td_retval[0] = HostIF_CheckMemory(vm);
-       break;
-       
-    case VMIO_REGISTER_PASSTHROUGH_IRQ: {
- #ifdef SUPPORT_PASSTHROUGH
--      p->p_retval[0] = Passthrough_RegisterIRQ((unsigned char) arg, "VMware", vmFreeBSD);
-+      td->td_retval[0] = Passthrough_RegisterIRQ((unsigned char) arg, "VMware", vmFreeBSD);
- #else
-       retval = EINVAL;
- #endif
-@@ -802,7 +808,7 @@
-       struct passthrough_iorange ior;
- 
-       err = HostIF_CopyFromUser(&ior, (char*)arg, sizeof(ior));
--      p->p_retval[0] = Passthrough_RegisterIORegion(ior.ioBase, ior.numPorts, "VMware");
-+      td->td_retval[0] = Passthrough_RegisterIORegion(ior.ioBase, ior.numPorts, "VMware");
- #else
-       retval = EINVAL;
- #endif
-@@ -823,7 +829,7 @@
-       struct passthrough_iorange ior;
- 
-       err = HostIF_CopyFromUser(&ior, (char*)arg, sizeof(ior));
--      p->p_retval[0] = Passthrough_ReleaseIORegion(ior.ioBase, ior.numPorts);
-+      td->td_retval[0] = Passthrough_ReleaseIORegion(ior.ioBase, ior.numPorts);
- #else
-       retval = EINVAL;
- #endif
-@@ -832,7 +838,7 @@
- 
-    case VMIO_START_PASSTHROUGH: {
- #ifdef SUPPORT_PASSTHROUGH
--      p->p_retval[0] = Passthrough_Init(vmFreeBSD);
-+      td->td_retval[0] = Passthrough_Init(vmFreeBSD);
- #else
-       retval = EINVAL;
- #endif
-@@ -841,7 +847,7 @@
- 
-    case VMIO_STOP_PASSTHROUGH: {
- #ifdef SUPPORT_PASSTHROUGH
--      p->p_retval[0] = Passthrough_Release(vmFreeBSD);
-+      td->td_retval[0] = Passthrough_Release(vmFreeBSD);
- #else
-       retval = EINVAL;
- #endif
-@@ -853,7 +859,7 @@
-       unsigned char irq;
-       if (vmFreeBSD->numPendingPassthroughIRQs > 0) {
-         irq = vmFreeBSD->pendingPassthroughIRQs[--vmFreeBSD->numPendingPassthroughIRQs],
--        p->p_retval[0] = vmFreeBSD->numPendingPassthroughIRQs;
-+        td->td_retval[0] = vmFreeBSD->numPendingPassthroughIRQs;
-       } else {
-         irq = 0x0;
-         retval = EAGAIN;
-@@ -950,7 +956,7 @@
-    va_list args;
-    
- 
--   vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+   vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
- 
-    va_start(args, fmt);
-    vsprintf(freebsdState.buf, fmt, args); 
-@@ -978,7 +984,7 @@
-    va_list args;
- 
- 
--   vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+   vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
-   
-    va_start(args, fmt);
-    vsprintf(freebsdState.buf, fmt, args); 
-@@ -1009,7 +1015,7 @@
- void
- Panic(char *fmt, ...)
- {
--   VMDriver *vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+   VMDriver *vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
-    va_list args;
- 
-    va_start(args, fmt);
-@@ -1029,13 +1035,13 @@
-    if (vm) { 
-      vLog(vm->logFD);
-      vWarning(vm);
--     sprintf(freebsdState.buf,"VMX86 driver panic. pid=%d\n\r",curproc->p_pid);  
-+     sprintf(freebsdState.buf,"VMX86 driver panic. pid=%d\n\r",curthread->td_proc->p_pid);  
-      vLog(vm->logFD);
-      vWarning(vm);
-    }
-   
-    /* XXX  Why it's right */ 
--   exit1(curproc, 0);
-+   exit1(curthread, 0);
-    /* NOTREACHED */
- }
- 
---- ./vmmon-only/freebsd/hostif.c.orig	Sat Nov 10 16:56:01 2001
-+++ ./vmmon-only/freebsd/hostif.c	Sat Nov 10 16:56:21 2001
-@@ -55,10 +55,9 @@
- 
- #include <vm/vm.h>
- #include <vm/vm_param.h>
-+#include <sys/lock.h>
- #if __FreeBSD_version >= 500018
- #include <sys/mutex.h>
--#else
--#include <sys/lock.h>
- #endif
- #include <vm/pmap.h>
- #include <vm/vm_map.h>
---- ./vmmon-only/freebsd/linux_emu.c.orig	Sat Nov 10 16:54:17 2001
-+++ ./vmmon-only/freebsd/linux_emu.c	Sat Nov 10 16:54:57 2001
-@@ -300,13 +300,13 @@
- }
- 
- static int
--linux_to_bsd_fdgetprm(struct proc *p, struct file *fp, struct linux_floppy_struct *flp)
-+linux_to_bsd_fdgetprm(struct thread *td, struct file *fp, struct linux_floppy_struct *flp)
- {
- 	int error;
- 	struct linux_floppy_struct fls;
- 	struct fd_type fdt;
- 
--	if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, p)) != 0)
-+	if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, td)) != 0)
- 	    return error;
- 	bzero(&fls, sizeof(fls));
- 	
-@@ -324,13 +324,13 @@
- }
- 
- static int
--linux_to_bsd_get_geometry(struct proc *p, struct file *fp, struct linux_hd_geometry *geo)
-+linux_to_bsd_get_geometry(struct thread *td, struct file *fp, struct linux_hd_geometry *geo)
- {
- 	int error;
- 	struct linux_hd_geometry drive_geo;
- 	struct disklabel dl;
- 	
--	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, p)) != 0)
-+	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
- 	    return error;
- 
- 	bzero(&drive_geo, sizeof(drive_geo));
-@@ -344,14 +344,14 @@
- }
- 
- static int
--linux_to_bsd_hdio_identity(struct proc *p, struct file *fp, struct linux_hd_driveid *id)
-+linux_to_bsd_hdio_identity(struct thread *td, struct file *fp, struct linux_hd_driveid *id)
- {
- 	int error;
- 	struct disklabel dl;
- 	struct linux_hd_driveid driveid;
- 	unsigned int capacity;
- 
--	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, p)) != 0)
-+	if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
- 	    return error;
- 
- 	bzero(&driveid, sizeof(driveid));
-@@ -382,13 +382,13 @@
- }
- 
- static int
--linux_to_bsd_cdromvolread(struct proc *p, struct file *fp, struct linux_cdrom_volctrl *vol)
-+linux_to_bsd_cdromvolread(struct thread *td, struct file *fp, struct linux_cdrom_volctrl *vol)
- {
- 	int error;
- 	struct ioc_vol bsd_vol;
- 	struct linux_cdrom_volctrl linux_vol;
- 
--	if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, p)) != 0)
-+	if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, td)) != 0)
- 	    return error;
- 
- 	linux_vol.channel0 = bsd_vol.vol[0];
-@@ -400,7 +400,7 @@
- }
- 
- static int
--linux_cdrom_get_multisession(struct proc *p, struct file *fp, struct linux_cdrom_multisession *muls)
-+linux_cdrom_get_multisession(struct thread *td, struct file *fp, struct linux_cdrom_multisession *muls)
- {
- struct linux_cdrom_multisession ms;
- struct ioc_toc_header h;
-@@ -411,7 +411,7 @@
- 	if ((error = copyin(muls, &ms, sizeof(ms))) != 0)
- 	    return error;
- 
--	if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, p)) != 0)
-+	if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, td)) != 0)
- 	    return error;
- 	
- 	bzero(&t, sizeof(t));
-@@ -419,7 +419,7 @@
- 	t.address_format = ms.addr_format ; /* BSD and LINUX formats equal */
- 	t.track = 0; /* get content from the first track */
- 
--	if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, p)) != 0) 
-+	if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, td)) != 0) 
- 	    return error;
- 	    
- 	bsd_to_linux_msf_lba(ms.addr_format, &t.entry.addr, &ms.addr);
-@@ -430,37 +430,37 @@
- }
- 
- static int
--linux_ioctl_hdfdcd(struct proc *p,  struct linux_ioctl_args *args)
-+linux_ioctl_hdfdcd(struct thread *td,  struct linux_ioctl_args *args)
- {
--    struct file *fp = p->p_fd->fd_ofiles[args->fd]; 
-+    struct file *fp = td->td_proc->p_fd->fd_ofiles[args->fd]; 
-     switch (args->cmd & 0xffff) {
- 	    case LINUX_HDIO_GET_IDENTITY:
- 	    case LINUX_HDIO_OBSOLETE_IDENTITY:
--		    return linux_to_bsd_hdio_identity(p, fp, (struct linux_hd_driveid *)args->arg);
-+		    return linux_to_bsd_hdio_identity(td, fp, (struct linux_hd_driveid *)args->arg);
- 	    case LINUX_HDIO_GETGEO:	
--		    return linux_to_bsd_get_geometry(p, fp, (struct linux_hd_geometry *)args->arg);
-+		    return linux_to_bsd_get_geometry(td, fp, (struct linux_hd_geometry *)args->arg);
- 
- 	    case LINUX_FDTWADDLE:
- 		    return 0;
- 	    case LINUX_CDROMVOLREAD:
--		    return linux_to_bsd_cdromvolread(p, fp, (struct linux_cdrom_volctrl*)args->arg);
-+		    return linux_to_bsd_cdromvolread(td, fp, (struct linux_cdrom_volctrl*)args->arg);
- 	    case LINUX_CDROMMULTISESSION:
--		    return linux_cdrom_get_multisession(p, fp, (struct linux_cdrom_multisession *)args->arg);
-+		    return linux_cdrom_get_multisession(td, fp, (struct linux_cdrom_multisession *)args->arg);
- 	    case LINUX_CDROM_SET_OPTIONS:
- 		    switch (args->arg) {
- 			case 0:
--				p->p_retval[0] = 0;
-+				td->td_retval[0] = 0;
- 				return 0;
- 			default:
- 				return ENOSYS;
- 		    }
- 		    break;
- 	    case LINUX_CDROM_CLEAR_OPTIONS:
--		    p->p_retval[0] = 0;
-+		    td->td_retval[0] = 0;
- 		    return 0;
- 	    case LINUX_CDROM_LOCKDOOR:
- 		    args->cmd = args->arg ? CDIOCPREVENT : CDIOCALLOW;
--		    return ioctl(p, (struct ioctl_args *)args);
-+		    return ioctl(td, (struct ioctl_args *)args);
- 	    case LINUX_CDROM_MEDIA_CHANGED:
- 	    case LINUX_CDROM_DRIVE_STATUS:
- 	    case LINUX_CDROM_DISC_STATUS:
-@@ -470,7 +470,7 @@
- 	    case LINUX_FDPOLLDRVSTAT:
- 		    return linux_fdpolldrvstat((struct linux_floppy_drive_struct*)args->arg);
- 	    case LINUX_FDGETPRM:
--		    return linux_to_bsd_fdgetprm(p, fp, (struct linux_floppy_struct*)args->arg);
-+		    return linux_to_bsd_fdgetprm(td, fp, (struct linux_floppy_struct*)args->arg);
-     }
-     return (ENOIOCTL);
- }
-@@ -482,7 +482,7 @@
- #define LINUX_TIOCLINUX		0x541C
- 		
- static int
--linux_tioclinux(struct proc *p, struct linux_ioctl_args *args)
-+linux_tioclinux(struct thread *td, struct linux_ioctl_args *args)
- {
- 	int type;
- 	int error = ENOIOCTL;
-@@ -503,7 +503,7 @@
- 
- 
- static int
--linux_ioctl_video(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_video(struct thread *td, struct linux_ioctl_args *args)
- {
- 	int error = ENOIOCTL;
- 
-@@ -513,7 +513,7 @@
- 		error = 0;
- 		break;
- 	case LINUX_TIOCLINUX:
--		error = linux_tioclinux(p, args);
-+		error = linux_tioclinux(td, args);
- 		break;
- 	default:
- 		break;
-@@ -526,18 +526,17 @@
- LINUX_IOCTL_SET(vmmon, IOCTLCMD_NONE, IOCTLCMD_LAST);
- 
- static int
--linux_ioctl_vmmon(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_vmmon(struct thread *td, struct linux_ioctl_args *args)
- {
- #define DEB(x)
- 
-     switch (args->cmd & 0xffff) {
- #define IOCTL(name) case IOCTLCMD_##name: args->cmd = VMIO_##name; \
- 	    	    DEB(printf("vmmware: IOCTL %s arg %p\n", #name, (void *)args->arg)); \
--	            return ioctl(p, (struct ioctl_args *)args);
-+	            return ioctl(td, (struct ioctl_args *)args);
- #include "ioctls.h"		    
- #undef IOCTL
-     }
-     return (ENOIOCTL);
- #undef DEB    
- }
--
---- ./vmnet-only/freebsd/vmnet_linux.c.orig	Sat Nov 10 16:54:17 2001
-+++ ./vmnet-only/freebsd/vmnet_linux.c	Sat Nov 10 16:54:59 2001
-@@ -76,9 +76,9 @@
- 
- 
- static int
--linux_ioctl_setmacaddr(struct proc *p,  struct linux_ioctl_args *args)
-+linux_ioctl_setmacaddr(struct thread *td,  struct linux_ioctl_args *args)
- {
--    struct file *fp = p->p_fd->fd_ofiles[args->fd]; 
-+    struct file *fp = td->td_proc->p_fd->fd_ofiles[args->fd]; 
-     int error;
-     VNet_SetMacAddrIOCTL macAddr;
- 	
-@@ -90,7 +90,7 @@
- 
-     switch (macAddr.version) {
- 	case 1:
--	  error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, p);
-+	  error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, td);
- 	  DEB(printf("Get ethernet address: %6D\n", macAddr.addr, ":"));
- 	  break;
- 	default:
-@@ -102,7 +102,7 @@
- 															     
- 
- static int
--linux_ioctl_net(struct proc *p,  struct linux_ioctl_args *args)
-+linux_ioctl_net(struct thread *td,  struct linux_ioctl_args *args)
- {
-     int error=ENOIOCTL;
-     
-@@ -116,7 +116,7 @@
- #endif		    
- 		case LINUX_SIOCSIFADDR:
- 		    args->cmd = SIOCSIFADDR;
--		    error = ioctl(p, (struct ioctl_args *)args); 
-+		    error = ioctl(td, (struct ioctl_args *)args); 
- 		    break;
- 		case LINUX_SIOCSLADRF:
- 		case LINUX_SIOCSKEEP:
-@@ -125,18 +125,18 @@
- 		    break;
- 		case LINUX_SIOCPORT:
- 	    	    args->cmd = VMIO_SIOCPORT;
--		    error = ioctl(p, (struct ioctl_args *)args);  
-+		    error = ioctl(td, (struct ioctl_args *)args);  
- 		    break;
- 		case LINUX_SIOCBRIDGE:
- 		    args->cmd = VMIO_SIOCBRIDGE;
--		    error = ioctl(p, (struct ioctl_args *)args);  
-+		    error = ioctl(td, (struct ioctl_args *)args);  
- 		    break;
- 		case LINUX_SIOCNETIF:
- 		    args->cmd = VMIO_SIOCNETIF;
--		    error = ioctl(p, (struct ioctl_args *)args);  
-+		    error = ioctl(td, (struct ioctl_args *)args);  
- 		    break;
- 		case LINUX_SIOCSETMACADDR:
--		    error = linux_ioctl_setmacaddr(p, args);
-+		    error = linux_ioctl_setmacaddr(td, args);
- 		    break;
-     }
-     DEB(printf(__FUNCTION__ ": return %d\n", error));
-@@ -147,16 +147,16 @@
- 
- /* What is the dumb idea to use SIOCSIFFLAGS ioctl, and directly pass flags? */
- static int
--linux_ioctl_net_sifflags(struct proc *p,  struct linux_ioctl_args *args)
-+linux_ioctl_net_sifflags(struct thread *td,  struct linux_ioctl_args *args)
- {
- 	int error;
- 
-     	DEB(printf(__FUNCTION__ ": cmd 0x%04lx arg %p\n", args->cmd, (void*)args->arg));
- 	args->cmd = SIOCGIFFLAGS; 
--	error = ioctl(p, (struct ioctl_args *)args); /* First try standart */
-+	error = ioctl(td, (struct ioctl_args *)args); /* First try standart */
- 	if (error) { 
- 		args->cmd = VMIO_SIOCSIFFLAGS;  /* Than vmnet */
--		error = ioctl(p, (struct ioctl_args *)args); 
-+		error = ioctl(td, (struct ioctl_args *)args); 
- 	}
-     	DEB(printf(__FUNCTION__ ": return %d\n", error));
- 	return error;
diff --git a/emulators/vmware3/files/m_waitok.patch b/emulators/vmware3/files/m_waitok.patch
deleted file mode 100644
index 3c234edafe33..000000000000
--- a/emulators/vmware3/files/m_waitok.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- vmmon-only/freebsd/driver.c.orig	Tue Feb 11 22:12:39 2003
-+++ vmmon-only/freebsd/driver.c	Tue Feb 11 22:22:35 2003
-@@ -91,6 +92,10 @@
- typedef void driver_intr_t(void*);
- #endif
- 
-+#ifndef M_WAITOK
-+#define M_WAITOK	0x0000
-+#endif
-+
- #ifdef SUPPORT_PASSTHROUGH
- #include "passthrough.h"	// _driver_ version of passthrough.h 
- #endif
---- vmmon-only/freebsd/hostif.c.orig	Tue Feb 11 22:12:40 2003
-+++ vmmon-only/freebsd/hostif.c	Tue Feb 11 22:22:15 2003
-@@ -100,6 +100,9 @@
- 
- #define HOST_ISTRACKED_PFN(_vm, _pfn, _vpn) (PhysTrack_Test(_vm->physTracker, _pfn))
- 
-+#ifndef M_WAITOK
-+#define M_WAITOK	0x0000
-+#endif
- 
- static
- int host_lock_ppn(PPN ppn)
diff --git a/emulators/vmware3/files/patch-bc b/emulators/vmware3/files/patch-bc
deleted file mode 100644
index b2764c90596a..000000000000
--- a/emulators/vmware3/files/patch-bc
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmnet-only/freebsd/vmnet.c.orig	Mon Jul 31 08:36:25 2000
-+++ vmnet-only/freebsd/vmnet.c	Mon Sep 11 00:34:08 2000
-@@ -164,7 +164,7 @@
- 
- 	s = splimp();
- 	if_attach(ifp);
--	ether_ifattach(ifp);
-+	ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
- 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
- 	splx(s);
- 	
diff --git a/emulators/vmware3/files/patch-bd b/emulators/vmware3/files/patch-bd
deleted file mode 100644
index ff0ea92d6a36..000000000000
--- a/emulators/vmware3/files/patch-bd
+++ /dev/null
@@ -1,27 +0,0 @@
---- vmmon-only/freebsd/driver.c.orig	Thu Jun 29 21:06:18 2000
-+++ vmmon-only/freebsd/driver.c	Sat Sep 23 01:41:34 2000
-@@ -73,6 +73,24 @@
- #include "private.h"
- #endif
- 
-+#if __FreeBSD_version >= 500013
-+enum intr_type {
-+    INTR_TYPE_TTY = 1,
-+    INTR_TYPE_BIO = 2,
-+    INTR_TYPE_NET = 4,
-+    INTR_TYPE_CAM = 8,
-+    INTR_TYPE_MISC = 16,
-+    INTR_HEAVY = 32,			/* heavyweight interrupt process */
-+    INTR_LIGHT = 64,			/* light weight interrupt thread */
-+    INTR_THREADED = INTR_LIGHT | INTR_HEAVY, /* any kind of interrupt thread */
-+    INTR_FAST = 128,
-+    INTR_EXCL =	256,			/* exclusive interrupt */
-+    INTR_MPSAFE = 512			/* this interrupt is SMP safe */
-+};
-+
-+typedef void driver_intr_t(void*);
-+#endif
-+
- #ifdef SUPPORT_PASSTHROUGH
- #include "passthrough.h"	// _driver_ version of passthrough.h 
- #endif
diff --git a/emulators/vmware3/files/patch-be b/emulators/vmware3/files/patch-be
deleted file mode 100644
index 3515097e1e04..000000000000
--- a/emulators/vmware3/files/patch-be
+++ /dev/null
@@ -1,125 +0,0 @@
---- vmmon-only/freebsd/hostif.c.orig	Mon Sep  2 19:19:50 2002
-+++ vmmon-only/freebsd/hostif.c	Mon Sep  2 19:30:03 2002
-@@ -55,7 +55,11 @@
- 
- #include <vm/vm.h>
- #include <vm/vm_param.h>
-+#if __FreeBSD_version >= 500018
-+#include <sys/mutex.h>
-+#else
- #include <sys/lock.h>
-+#endif
- #include <vm/pmap.h>
- #include <vm/vm_map.h>
- #include <vm/vm_page.h>
-@@ -107,7 +111,21 @@
- 
- 	paddr = (vm_offset_t)addr;
-         m = PHYS_TO_VM_PAGE(paddr);
--        vm_page_wire(m);
-+#if __FreeBSD_version >= 500038
-+	GIANT_REQUIRED;
-+	vm_page_lock_queues();
-+	vm_page_wire(m);
-+	vm_page_unlock_queues();
-+#elif __FreeBSD_version >= 500021
-+	GIANT_REQUIRED;
-+	vm_page_wire(m);
-+#elif __FreeBSD_version >= 500013
-+	mtx_lock(&vm_mtx);
-+	vm_page_wire(m);
-+	mtx_unlock(&vm_mtx);
-+#else
-+	vm_page_wire(m);
-+#endif
- 	return 0;
- }     
- 
-@@ -120,7 +138,21 @@
- 
- 	paddr = (vm_offset_t)addr;
- 	m = PHYS_TO_VM_PAGE(paddr);
-+#if __FreeBSD_version >= 500038
-+	GIANT_REQUIRED;
-+	vm_page_lock_queues();
-+	vm_page_unwire(m, 1);
-+	vm_page_unlock_queues();
-+#elif __FreeBSD_version >= 500021
-+	GIANT_REQUIRED;
-+	vm_page_unwire(m, 1);
-+#elif __FreeBSD_version >= 500013
-+	mtx_lock(&vm_mtx);
- 	vm_page_unwire(m, 1);
-+	mtx_unlock(&vm_mtx);
-+#else
-+	vm_page_unwire(m, 1);
-+#endif
-   	return 0;
- }
-  
-@@ -1066,10 +1098,33 @@
-         return NULL;
-   }
-   paddr = vtophys(addr);
-+#if __FreeBSD_version >= 500038
-+  GIANT_REQUIRED;
-+  ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-+  ka->map = PHYS_TO_VM_PAGE(paddr);
-+  vm_page_lock_queues();
-+  vm_page_wire(ka->map);
-+  vm_page_unlock_queues();
-+  pmap_qenter(ka->kaddr, &ka->map, 1);
-+#elif __FreeBSD_version >= 500021
-+  GIANT_REQUIRED;
-+  ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-+  ka->map = PHYS_TO_VM_PAGE(paddr);
-+  vm_page_wire(ka->map);
-+  pmap_kenter(ka->kaddr, paddr);
-+#elif __FreeBSD_version >= 500013
-+  mtx_lock(&vm_mtx);
-+  ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-+  ka->map = PHYS_TO_VM_PAGE(paddr);
-+  vm_page_wire(ka->map);
-+  pmap_kenter(ka->kaddr, paddr);
-+  mtx_unlock(&vm_mtx);
-+#else
-   ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-   ka->map = PHYS_TO_VM_PAGE(paddr);
-   vm_page_wire(ka->map); 
-   pmap_kenter(ka->kaddr, paddr);	
-+#endif
-   return ka->kaddr;
- }
- 
-@@ -1079,9 +1134,29 @@
-   if (ka->map==NULL)
- 	  return 0;
- 
--  vm_page_unwire(ka->map, 1); 
--  pmap_kremove(ka->kaddr);	
-+#if __FreeBSD_version >= 500038
-+  GIANT_REQUIRED;
-+  vm_page_lock_queues();
-+  vm_page_unwire(ka->map, 1);
-+  vm_page_unlock_queues();
-+  pmap_qremove(ka->kaddr, 1);
-   kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+#elif __FreeBSD_version >= 500021
-+  GIANT_REQUIRED;
-+  vm_page_unwire(ka->map, 1);
-+  pmap_kremove(ka->kaddr);
-+  kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+#elif __FreeBSD_version >= 500013
-+  mtx_lock(&vm_mtx);
-+  vm_page_unwire(ka->map, 1);
-+  pmap_kremove(ka->kaddr);
-+  kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+  mtx_unlock(&vm_mtx);
-+#else
-+  vm_page_unwire(ka->map, 1);
-+  pmap_kremove(ka->kaddr);
-+  kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+#endif
-   ka->kaddr = 0;
-   ka->map = NULL;
-   return 0;
diff --git a/emulators/vmware3/files/patch-bf b/emulators/vmware3/files/patch-bf
deleted file mode 100644
index e2b7e590503f..000000000000
--- a/emulators/vmware3/files/patch-bf
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vmware-distrib/vmmon-only/common/hostif.h.orig	Wed Jul 18 11:27:34 2001
-+++ ../vmware-distrib/vmmon-only/common/hostif.h	Wed Jul 18 11:29:28 2001
-@@ -118,7 +118,12 @@
- EXTERN void  HostIF_GlobalVMLock(int callerID);
- EXTERN void  HostIF_GlobalVMUnLock(int callerID);
- 
-+#ifdef __FreeBSD__
-+/* The HostIF_APIC_Base for FreeBSD still just takes two parameters */
-+EXTERN MA    HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr);
-+#else
- EXTERN MA    HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr, Bool probe);
-+#endif
- EXTERN MA    HostIF_IOAPIC_Base(VMDriver *vm);
- 
- EXTERN void  HostIF_LockKernel(void);
diff --git a/emulators/vmware3/files/pmap.patch b/emulators/vmware3/files/pmap.patch
deleted file mode 100644
index 2a914e47c047..000000000000
--- a/emulators/vmware3/files/pmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmmon-only/freebsd/hostif.c.orig	Tue Dec  4 20:49:08 2001
-+++ vmmon-only/freebsd/hostif.c	Tue Dec  4 20:49:44 2001
-@@ -170,7 +170,7 @@
- {
- #define DEB(x) 
-    caddr_t addr = (caddr_t)VPN_2_VA(ppn);
--   pt_entry_t pteptr = (pt_entry_t)vtopte(addr);
-+   pt_entry_t *pteptr = vtopte(addr);
-    PTE pte;
- 
-    DEB(printf("FindMPN: for page %d address %p(phys %p) pteptr %p", ppn, addr, (caddr_t)vtophys(addr), pteptr));
diff --git a/emulators/vmware3/files/vm_types_h.patch b/emulators/vmware3/files/vm_types_h.patch
deleted file mode 100644
index 5a864a3b6a5d..000000000000
--- a/emulators/vmware3/files/vm_types_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vmmon-only/include/vm_types.h.patched	Tue Apr  8 15:10:25 2003
-+++ vmmon-only/include/vm_types.h	Tue Apr  8 15:12:07 2003
-@@ -144,10 +144,6 @@
- #define offsetof(type, member) ( (int) & ((type*)0) -> member )
- #endif
- 
--
--#define MIN(_a, _b)   (((_a) < (_b)) ? (_a) : (_b))
--#define MAX(_a, _b)   (((_a) > (_b)) ? (_a) : (_b))
--
- #define ROUNDUP(x,y)		(((x) + (y) - 1) / (y) * (y))
- #define ROUNDDOWN(x,y)		((x) / (y) * (y))
- #define ROUNDUPBITS(x, bits)	(((uint32) (x) + MASK(bits)) & ~MASK(bits))
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
index 2f2d1f00d674..18c3f3bc2fab 100644
--- a/emulators/vmware3/files/vmware.sh
+++ b/emulators/vmware3/files/vmware.sh
@@ -53,8 +53,8 @@ start)
 		echo "Your VMware installation seems broken.  Please reinstall VMware port." >&2
 		exit 255
 	fi
-    	echo -n > /dev/vmnet1 2>&1 || true
-	echo -n > $dev_vmnet1 2>&1
+       (echo -n > $dev_vmnet1) 2>/dev/null || \
+	    echo -n > /dev/vmnet1 2>&1
 	ifconfig vmnet1 $host_ip netmask $netmask
 	if [ X$bridged = XYES ]; then
 	    kldstat -v | grep netgraph >/dev/null || kldload netgraph.ko