From owner-freebsd-ports Tue Feb 27 21:21:37 2001 Delivered-To: freebsd-ports@freebsd.org Received: from syncopation-03.iinet.net.au (syncopation-03.iinet.net.au [203.59.24.49]) by hub.freebsd.org (Postfix) with SMTP id 3405437B71B for ; Tue, 27 Feb 2001 21:21:31 -0800 (PST) (envelope-from julian@elischer.org) Received: (qmail 9638 invoked by uid 666); 28 Feb 2001 05:33:23 -0000 Received: from i003-146.nv.iinet.net.au (HELO elischer.org) (203.59.3.146) by mail.m.iinet.net.au with SMTP; 28 Feb 2001 05:33:23 -0000 Message-ID: <3A9C8AD6.1A7CE8D7@elischer.org> Date: Tue, 27 Feb 2001 21:21:26 -0800 From: Julian Elischer X-Mailer: Mozilla 4.7 [en] (X11; U; FreeBSD 5.0-CURRENT i386) X-Accept-Language: en, hu MIME-Version: 1.0 To: ports@freebsd.org Subject: vmware port problems [patches].. Content-Type: multipart/mixed; boundary="------------0F8161668C77A723116ACBF2" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org This is a multi-part message in MIME format. --------------0F8161668C77A723116ACBF2 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Obviously some wierd CVS repository stuff has happenned as I needed to delete the CVS repository Mk and vmware directories before I could get it to work. Now on a separate thread: the vmware port needs to have the following patches added to it to make it compile for -current. Can a port-meister incorporate them? (however that's done) -- __--_|\ Julian Elischer / \ julian@elischer.org ( OZ ) World tour 2000-2001 ---> X_.---._/ v --------------0F8161668C77A723116ACBF2 Content-Type: text/plain; charset=iso-8859-15; name="adiff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="adiff" diff -r -u vmware/work/vmware-distrib/vmmon-only/freebsd/driver.c vmware.hold/work/vmware-distrib/vmmon-only/freebsd/driver.c --- vmware/work/vmware-distrib/vmmon-only/freebsd/driver.c Thu Dec 16 13:49:30 1999 +++ vmware.hold/work/vmware-distrib/vmmon-only/freebsd/driver.c Thu Dec 28 20:40:33 2000 @@ -281,6 +281,8 @@ } /* Now declare the module to the system */ DEV_MODULE(vmmon, vmmon_modeevent, 0); +MODULE_DEPEND(vmmon, linux, 1, 1, 1); +/* MODULE_DEPEND(vmmon, linuxelf, 1, 1, 1) */ /* *---------------------------------------------------------------------- diff -r -u vmware/work/vmware-distrib/vmmon-only/freebsd/driver.h vmware.hold/work/vmware-distrib/vmmon-only/freebsd/driver.h --- vmware/work/vmware-distrib/vmmon-only/freebsd/driver.h Thu Dec 16 15:43:16 1999 +++ vmware.hold/work/vmware-distrib/vmmon-only/freebsd/driver.h Sun Jan 21 16:47:01 2001 @@ -9,6 +9,9 @@ #define NUM_PASSTHROUGH_IRQS 10 #define DRIVER_MAX_PIDS 16 +#if (__FreeBSD__ == 5) +#include +#endif struct VMDriver; diff -r -u vmware/work/vmware-distrib/vmmon-only/freebsd/linux_emu.c vmware.hold/work/vmware-distrib/vmmon-only/freebsd/linux_emu.c --- vmware/work/vmware-distrib/vmmon-only/freebsd/linux_emu.c Thu Dec 16 15:59:37 1999 +++ vmware.hold/work/vmware-distrib/vmmon-only/freebsd/linux_emu.c Thu Dec 28 19:18:50 2000 @@ -39,7 +39,11 @@ #include #include +#if (__FreeBSD__ == 5) +#include +#else #include +#endif #define FILECODE "F(300-1)" #include "modulecall.h" diff -r -u vmware/work/vmware-distrib/vmnet-only/freebsd/vmnet.c vmware.hold/work/vmware-distrib/vmnet-only/freebsd/vmnet.c --- vmware/work/vmware-distrib/vmnet-only/freebsd/vmnet.c Thu Dec 16 15:57:00 1999 +++ vmware.hold/work/vmware-distrib/vmnet-only/freebsd/vmnet.c Thu Dec 28 21:11:00 2000 @@ -116,6 +116,7 @@ * IMPORTANT: Must be before netgraph node declaration. */ DEV_MODULE(vmnet, vmnet_modeevent, 0); +MODULE_DEPEND(vmnet, linux, 1, 1, 1); static int vmnet_ifioctl(struct ifnet *, u_long, caddr_t); @@ -133,7 +134,11 @@ struct ifnet *ifp = &sc->iface.arpcom.ac_if; intrmask_t s; +#if (__FreeBSD__ == 5) + ifp->if_unit = dev2unit(sc->dev); +#else ifp->if_unit = lminor(sc->dev); +#endif ifp->if_name = DEVICE_NAME; ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX /*| IFF_MULTICAST*/; @@ -152,9 +157,13 @@ DLog(Linfo, DEVICE_NAME "%d: Ethernet address: %6D", ifp->if_unit, sc->iface.arpcom.ac_enaddr, ":"); s = splimp(); +#if (__FreeBSD__ == 5) + ether_ifattach(ifp, 1); +#else if_attach(ifp); ether_ifattach(ifp); bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); +#endif splx(s); return 0; @@ -178,7 +187,11 @@ struct vmnet_softc *sc; int unit; +#if (__FreeBSD__ == 5) + unit = dev2unit(dev); +#else unit = lminor(dev); +#endif DLog(Lenter, "%d %p", unit, dev); if (dev->si_drv1) { DLog(Lexit, "old %p, %p", dev, dev->si_drv1); diff -r -u vmware/work/vmware-distrib/vmnet-only/freebsd/vmnet_linux.c vmware.hold/work/vmware-distrib/vmnet-only/freebsd/vmnet_linux.c --- vmware/work/vmware-distrib/vmnet-only/freebsd/vmnet_linux.c Thu Dec 16 15:58:19 1999 +++ vmware.hold/work/vmware-distrib/vmnet-only/freebsd/vmnet_linux.c Thu Dec 28 19:18:02 2000 @@ -35,7 +35,11 @@ #include #include +#if (__FreeBSD__ == 5) +#include +#else #include +#endif #include "vmnet.h" #include "../vm_oui.h" --------------0F8161668C77A723116ACBF2-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message