Date: Fri, 31 Jan 2003 03:22:21 -0800 (PST) From: ANYBODY <somebody@kashmir.etowns.net> To: freebsd-gnats-submit@FreeBSD.org, <camel@gu.ru> Cc: alfred@FreeBSD.org, <freebsd-ports-bugs@FreeBSD.org>, <bug-followup@FreeBSD.org>, <freebsd-emulation@FreeBSD.org>, The Gupta Age <thegage@kashmir.etowns.net> Subject: Re: ports/46780: vmware2 port is broken in 5.0-current/2003-01-05 Message-ID: <20030131024739.U7502-200000@hurd1.kashmir.etowns.net>
index | next in thread | raw e-mail
[-- Attachment #1 --] Regarding: http://www.FreeBSD.org/cgi/query-pr.cgi?pr=ports/46780 The port breaks becuase of some (i believe temp.) changes in src/sys/sys/filedesc.h and <sys/malloc.h> The most recent note in filedesc.h cvs update log by alfred is very much self explanatory. I am attaching with this email a patch that should get it compiling again. I will very much appreciate if some commiter will commit it. I dont really know if the patch gets it completely working again or not.... I guess it should. will somebody double check it as well. Feel free to email me with any questions. Saurabh Gupta Systems Engineer. [-- Attachment #2 --] --- work_o/vmware-distrib/vmmon-only/freebsd/driver.c Fri Nov 1 01:26:14 2002 +++ work/vmware-distrib/vmmon-only/freebsd/driver.c Wed Jan 29 08:58:28 2003 @@ -352,7 +352,7 @@ #endif } - vmFreeBSD = (VMFreeBSD *) malloc(sizeof (VMFreeBSD), M_DEVBUF, M_WAITOK); + vmFreeBSD = (VMFreeBSD *) malloc(sizeof (VMFreeBSD), M_DEVBUF, M_ZERO); if (vmFreeBSD == NULL) { Warning("FreeBSD_Driver_Open malloc failed\n"); return ENOMEM; --- work_o/vmware-distrib/vmmon-only/freebsd/hostif.c Fri Nov 1 01:26:14 2002 +++ work/vmware-distrib/vmmon-only/freebsd/hostif.c Wed Jan 29 09:01:46 2003 @@ -553,7 +553,7 @@ void * HostIF_AllocKernelMem(int size, int wired) { - void * ptr = malloc(size, M_DEVBUF, M_WAITOK); + void * ptr = malloc(size, M_DEVBUF, M_ZERO); if (ptr==NULL) { Warning("HostIF_AllocKernelMem failed (size=0%x)\n",size); @@ -566,7 +566,7 @@ void * HostIF_AllocPage(int wired) { - void *addr= contigmalloc(PAGE_SIZE, M_DEVBUF, M_WAITOK, 0, ~0ul, PAGE_SIZE, 0); + void *addr= contigmalloc(PAGE_SIZE, M_DEVBUF, M_ZERO, 0, ~0ul, PAGE_SIZE, 0); if (addr==0) { Warning("get_free_page() failed\n"); } --- work_o/vmware-distrib/vmmon-only/freebsd/linux_emu.c Fri Nov 1 01:26:14 2002 +++ work/vmware-distrib/vmmon-only/freebsd/linux_emu.c Fri Jan 31 01:53:10 2003 @@ -32,6 +32,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> +#include <sys/filedesc.h> #include <sys/sysproto.h> #include <sys/disklabel.h> #include <sys/cdio.h> --- work_o/vmware-distrib/vmnet-only/freebsd/vmnet_linux.c Fri Nov 1 01:26:14 2002 +++ work/vmware-distrib/vmnet-only/freebsd/vmnet_linux.c Fri Jan 31 01:55:16 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>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030131024739.U7502-200000>