This commit was manufactured by cvs2svn to create tag 'RELEASE_4_2_0'.release/4.2.0

10 files changed, 0 insertions, 391 deletions

diff --git a/emulators/vmware3/files/Hints.FreeBSD b/emulators/vmware3/files/Hints.FreeBSD
deleted file mode 100644
index 59bf8445adbc..000000000000
--- a/emulators/vmware3/files/Hints.FreeBSD
+++ /dev/null
@@ -1,117 +0,0 @@
-$FreeBSD$
-
-Here is a list of some useful hints on using VMware on FreeBSD.
-
-- Note that this port includes some kernel modules, which means you
-should rebuild and reinstall this port everytime you update the kernel
-so as to keep them in sync; otherwise VMware might coredump or crash
-together with the whole system if kernel interfaces were somewhat
-different than before.
-
-- Full screen text mode does not work.  Don't ever do it!
-
-- Full screen graphics mode will work, but you have to be careful e.g.
-when running a DOS prompt on MS Windows.  Hitting Alt+Enter will crash
-VMware before you can say "Chuck!"
-
-- Running VMware as root is NOT the right way to do it.  Edit
-/etc/fbtab to obtain the proper permission for the device files that
-you are going to access, then run VMware as a normal user.
-
-- Raw disk may not work.  Use virtual or plain disk instead.
-
-- The vmware-mount.pl utility does not work. If you want to mount
-the "disk" while VMware is not running, you must use plain disks
-instead of virtual ones. Set up a 63 sector file as an "mbr"
-section, then a file for each partition on the "plain" disk.
-To mount the "disk", use vnconfig -c /dev/vn__ file and
-then mount the vn device.
-
-If you are setting up a plain disk as a workaround for the broken
-raw disks, you will need to set up the disk description file
-by hand, as the configuration editor will complain. Here is a
-sample one:
-
-DRIVETYPE	ide
-CYLINDERS	16383
-HEADS		16
-SECTORS		63
-ACCESS "/path/disk.mbr" 0 63
-ACCESS "/dev/rad0s1" 63 4192902
-RDONLY "/dev/null" 4192965 12305790
-
-The geometry must be the physical geometry reported by the disk.
-grep ad0 /var/run/dmesg.boot and look for the 3 numbers in the
-brackets. They are the C/H/S.
-
-In the example above, "disk.mbr" is file used to keep a replacement
-MBR for the disk. You can use dd if=/dev/rad0 bs=1b count=63 of=mbr
-to create it if you like. The reason is so that the guest's decision
-about which OS you booted last is different than the host's (this is
-for the FreeBSD boot manager). You can also feel free to replace
-the MBR with the standard boot manager if you like. fdisk(8) and a vn
-device can help with this, though you will have to be sure and
-supply the correct geometry to fdisk(8) since the vn device won't
-support those calls. This time it's the BIOS "fake" geometry.
-Watch out!
-
-As you can see, the 1st partition simply is a FreeBSD slice device.
-The first number after the filename is the offset in blocks where the
-given file starts in the plain disk. The last number on the line is
-the length of the block. If you are using a file, its length must
-be equal to this number * 512.
-
-The last entry is an example of how to block out partitions you don't
-want VMware to mess with. Why do this instead of simply making the
-C/H/S numbers for the disk smaller? Because then the guest's BIOS
-might not make the same choices about the "fake" geometry to use,
-which would prevent the OS from booting in most cases.
-
-You might be able to follow the same procedure to make SCSI drives
-work. It is slightly less likely to work as SCSI vendors often
-differ as to how they set up BIOS geometries. Your raw device
-must end up having the same BIOS geometry as a Bustek SCSI
-controller, which is the device VMware virtually supplies as the
-host adapter.
-
-- It is a good idea to disconnect removable media devices (CDROMs
-and Floppies and the like) from the "guest" either when they are
-empty or when you're about to eject the media.
-
-- Under FreeBSD, floppy device should be configured as follows:
-
-	Type: file
-	Path: /dev/rfd0
-
-(Obtain the write permission on /dev/rfd0 if you write floppy disks)
-
-- VMware creates a file that is about 25% larger than the guest OS's
-RAM size, unlinks it and mmap's on it on the first startup of the VM.
-
-The default directory for the mmap is the value of TMPDIR environment
-variable, or if it's undefined, /tmp.
-
-Therefore, it would be a good idea to have your TMPDIR variable
-defined as a directory 1) that performs fast, 2) that has sufficient
-free space, and 3) that isn't on MFS; if your /tmp doesn't meet those
-three conditions.
-
-1 is because that will significantly improve the performance, 2 is
-because the VM cannot even boot when the mmap fails, and 3 is because
-such a large, active file on MFS could lead the system to deadlocks.
-
-
-Alternatively, you can make /compat/linux/tmp to fake /tmp, however,
-you should note that it would cause you silly troubles: Imagine a
-Linux application (say, Linux Netscape) which creates a temporary file
-in /tmp and passes it to some external program; you'll see it actually
-creates a file in /compat/linux/tmp when the external program searches
-/tmp literally.
-
-- Don't miss the VMware FAQ available on the official site.
-
-	http://www.vmware.com/products/productfaq.html
-
--- 
-Akinori -Aki- MUSHA <knu@idaemons.org>
-Nick Sayer <nsayer@FreeBSD.org>
diff --git a/emulators/vmware3/files/Makefile b/emulators/vmware3/files/Makefile
deleted file mode 100644
index 73c7bbd4ac41..000000000000
--- a/emulators/vmware3/files/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	vmmon-only
-
-.include <bsd.subdir.mk>
diff --git a/emulators/vmware3/files/Makefile.vmmon b/emulators/vmware3/files/Makefile.vmmon
deleted file mode 100644
index ad036c646530..000000000000
--- a/emulators/vmware3/files/Makefile.vmmon
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-all:	
-	make -f Makefile.FreeBSD SMP=YES clean all
-	make -f Makefile.FreeBSD SMP=NO clean all
-
-install:	
-	make -f Makefile.FreeBSD SMP=YES install
-	make -f Makefile.FreeBSD SMP=NO install
diff --git a/emulators/vmware3/files/README.FreeBSD b/emulators/vmware3/files/README.FreeBSD
deleted file mode 100644
index 78ca8de35360..000000000000
--- a/emulators/vmware3/files/README.FreeBSD
+++ /dev/null
@@ -1,79 +0,0 @@
-VMware 2.0 for Linux on FreeBSD.
-$Date: 2000/01/23 22:28:10 $
-$FreeBSD$
-
-Introduction.
-
-This piece of software provides some basic support for running
-the VMware 2.0 for Linux on FreeBSD 4.0 and better ;) systems.
-
-===
-
-What's done.
-
-At this time I was able to successfully run the following operation systems
-under VMware on FreeBSD:
-
-  - FreeBSD 4.0 Current
-  - Linux (Debian 2.1)
-  - Windows NT
-  - Windows 95 OSR2 (in safe mode :)
-  - MS DOS 7.0 (Part of Win'95)
-
-I think that all platforms supported by VMware should work under FreeBSD.
-	
-
-Installation procedure.
-
-The easiest solution is to obtain the vmware port and try to build it.
-The name of the port is vmware.tar.gz, and it can be downloaded from the 
-following location:
-
-http://www.mindspring.com/~vsilyaev/vmware/files/vmware.tar.gz
-
-If you are like to use the linux proc filesystem emulator, you are need 
-to install the next port:
-
-http://www.mindspring.com/~vsilyaev/vmware/files/linuxproc.tar.gz
-
-At build time, you will get further instructions on how to proceed.
-
-After a successful port installation you will need to obtain a license key 
-to run VMware (you can use an old one for Linux). If you want to obtain 
-a new key from http://www.vmware.com , you will have to select Linux as the 
-'server' platform.
-
-Features currently unsupported
- 
-   - Fullscreen text mode
-	
-   - Mounting vmware virtual drive
-   
-   - Parallel ports were never tested. However, to support bidirectional 
-     transfers, we will need a FreeBSD version of the vmppuser driver.
-
-Caveats.
-
-    - Onle one guest may be runned at one time.
-
-    - Floppy disk detection currently doesn't work. It is assumed that
-      a disk is always present in the floppy drive. Because of that, if you
-      have enabled both IDE and floppy drives in the same VMware session, you
-      _must_ select the right booting order in the Phoenix BIOS Setup.
-      
-    - Support only for Host networking. Doesn't have a bridgink networking
-      But really this mean, that you are need to enable gateway on
-      our FreeBSD box. And after that virtual machine can communicate 
-      with a rest of the world.
-   
-Copyright issue.
-
-	Unclear. My own code has a BSD-style copyright license,
-	but in order to write it, I used VMware-copyrighted sources.
-	In any case, I'm distributing only my own patch set, and all
-	modified files retain the original copyright information.
-
-Author.
-
-	Vladimir N. Silyaev. 
-	E-Mail: vsilyaev@mindspring.com
diff --git a/emulators/vmware3/files/config b/emulators/vmware3/files/config
deleted file mode 100644
index 66c1a93c6b33..000000000000
--- a/emulators/vmware3/files/config
+++ /dev/null
@@ -1,7 +0,0 @@
-vmware.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware"
-wizard.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware-wizard"
-dhcpd.fullpath = "@@PREFIX@@/lib/vmware/bin/vmnet-dhcpd"
-loop.fullpath = ""@@PREFIX@@/lib/vmware/bin/vmware-loop"
-libdir = "@@PREFIX@@/lib/vmware/lib"
-vmnet1.HostOnlyAddress = "@@HOST_IP@@"
-vmnet1.HostOnlyNetMask = "@@NETMASK@@"
diff --git a/emulators/vmware3/files/df b/emulators/vmware3/files/df
deleted file mode 100644
index b9db0532e013..000000000000
--- a/emulators/vmware3/files/df
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-# Hacky emulation of GNU df.
-# Intented to use with vmware wizard.
-# Depend from the _absence_ linux version perl in the dir /compat/linux/usr/bin/
-#
-# $FreeBSD$
-#
-@NARGV=('-n');
-$type=0;
-foreach (@ARGV) {
-	exit if $_ eq '-n'; # Aargh it's me again, exit immediatly
-	next if $_ eq '-P';
-	$type=1,next if $_ eq '-T';
-	push @NARGV, $_;
-}
-
-$line = 0;
-
-open(DF,"-|") or exec '/bin/df', @NARGV;
-while(<DF>) {
-   
-   unless ($type) { print $_; next;}
-   @cols = split();
-   if ($line++) {
-	$col = 'ext2fs';
-   } else {
-	$col = 'Type';
-   }
-   @cols = (@cols[0], $col, @cols[1..$#cols]);
-   print join("\t", @cols),"\n";
-}
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/vmware b/emulators/vmware3/files/vmware
deleted file mode 100644
index 6693fad91f09..000000000000
--- a/emulators/vmware3/files/vmware
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# Run vmware
-#
-# $FreeBSD$
-
-if [ ! -e @@LINUXBASE@@/proc/cpuinfo ]; then
-    echo "************************************************************"
-    echo "It seems Linux procfs is not mounted on @@LINUXBASE@@/proc."
-    echo "VMware does not work without Linux procfs mounted."
-    echo
-    echo "For details, see linprocfs(5) manpage."
-    echo "************************************************************"
-    exit 1
-fi
-
-LANG=C
-PATH=/bin:$PATH
-
-if [ _$TMPDIR = _ ]; then 
-    TMPDIR=/var/tmp
-    echo Setting TMPDIR="$TMPDIR".
-    export TMPDIR
-fi
-
-exec @@PREFIX@@/lib/vmware/bin/vmware "$@"
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
deleted file mode 100644
index ee6db6d0d76b..000000000000
--- a/emulators/vmware3/files/vmware.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# Start or stop vmware
-#
-# $FreeBSD$
-
-vmware_config_file=@@PREFIX@@/etc/vmware/config
-
-if [ ! -e $vmware_config_file ]; then
-    echo "$vmware_config_file does not exist!" >&2
-    exit 255
-fi
-
-vmware_config() {
-    cat $vmware_config_file | while read var eq value; do
-	if [ "$1" = "$var" ]; then
-	    ret=`expr "$value" : '"\(.*\)"$'`
-	    echo ${ret:-$value}
-	    break
-	fi
-    done
-}
-
-vmware=`vmware_config vmware.fullpath`
-vmware_libdir=`vmware_config libdir`
-networking=@@NETWORKING@@
-host_ip=`vmware_config vmnet1.HostOnlyAddress`
-netmask=`vmware_config vmnet1.HostOnlyNetMask`
-dev_vmnet1=@@LINUXBASE@@/dev/vmnet1
-
-if [ ! -x $vmware ]; then
-    echo "$vmware does not exist!" >&2
-    exit 255
-fi
-
-if [ `sysctl -n hw.ncpu` -eq 1 ]; then
-    suffix=up
-else
-    suffix=smp
-fi
-
-exec >/dev/null
-
-case $1 in
-start)
-    kldload ${vmware_libdir}/modules/vmmon_${suffix}.ko
-    if [ $networking -eq 1 ]; then
-	sysctl net.link.ether.bridge_refresh && bridge="_bridge"
-	kldload if_tap.ko
-	if [ ! -e $dev_vmnet1 ]; then
-		echo "$dev_vmnet1 does not exist!" >&2
-		echo "Your VMware installation seems broken.  Please reinstall VMware port." >&2
-		exit 255
-	fi
-	echo -n > $dev_vmnet1
-	ifconfig vmnet1 $host_ip netmask $netmask
-	if [ _$bridge != _ ]; then
-	    sysctl -w net.link.ether.bridge_refresh=1
-	    sysctl -w net.link.ether.bridge=1
-	fi
-    fi
-    echo -n " VMware${bridge}" >&2
-    ;;
-
-stop)
-    kldunload vmmon_${suffix}
-    if [ $networking -eq 1 ]; then
-	ifconfig vmnet1 down
-	ifconfig vmnet1 delete $host_ip
-	sysctl net.link.ether.bridge_refresh && bridge="_bridge"
-	[ _$bridge != _ ] && sysctl -w net.link.ether.bridge_refresh=1
-    fi
-    ;;
-
-*)
-    echo "usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac