From owner-freebsd-stable@FreeBSD.ORG  Mon Sep 29 14:06:32 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8907C16A4B3
	for <freebsd-stable@freebsd.org>;
	Mon, 29 Sep 2003 14:06:32 -0700 (PDT)
Received: from spadger.best.vwh.net (spadger.best.vwh.net [192.220.100.249])
	by mx1.FreeBSD.org (Postfix) with SMTP id A350F44030
	for <freebsd-stable@freebsd.org>;
	Mon, 29 Sep 2003 14:06:28 -0700 (PDT)
	(envelope-from spadger@spadger.best.vwh.net)
Received: (qmail 42879 invoked by uid 25849); 29 Sep 2003 21:06:28 -0000
Date: Mon, 29 Sep 2003 21:06:28 +0000
From: Andrew Sparrow <spadger@spadger.best.vwh.net>
To: Max Khon <fjoe@iclub.nsu.ru>
Message-ID: <20030929210628.A5276@spadger.best.vwh.net>
References: <3F77EAE3.1060506@aeefyu.net>
	<1064823907.9010.1.camel@pyanfar.ece.cmu.edu>
	<20030929195805.GA94995@iclub.nsu.ru> <20030929202003.GB94995@iclub.nsu.ru>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <20030929202003.GB94995@iclub.nsu.ru>;
	from fjoe@iclub.nsu.ru on Tue, Sep 30, 2003 at 03:20:03AM +0700
cc: Aeefyu <afu-subscribed-list@aeefyu.net>
cc: freebsd-emulation@freebsd.org
cc: freebsd-stable@freebsd.org
cc: anders@freebsd.org
Subject: Re: Failure to build (ports) vmware2 in 4-9-PRERELEASE
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Sep 2003 21:06:32 -0000

On Tue, Sep 30, 2003 at 03:20:03AM +0700, Max Khon wrote:
> Hello!
> 
> On Tue, Sep 30, 2003 at 02:58:05AM +0700, Max Khon wrote:
> 
> > > > I got the following errors in re-building emulators/vmware2. (need to 
> > > > change the netgraph bridging interface)
> > > > Anyone experiencing the similar symptoms?
> > > 
> > > The PAE import broke vmware2; no ETA on a fix that I've heard.  I
> > > suggest sticking with RELENG_4_8.
> > 
> > Attached patch works for me.
> > (run "patch <Makefile.diff" in ports/emulators/vmware2).
> > I would like to commit it after maintainer approval.
> 
> Oops, parenthesis confuse arithmetic expression parser in
> 4.8-RELEASE and earlier. Corrected patch (without parenthesis) is attached.
> 

The patches that Anders Nordby (thanks Anders!!) supplied in the
commentary for PR55928 still work fine for me, on a -PRERELEASE of
Sep 18th):


diff -Nur vmware2.old/Makefile vmware2/Makefile
      --- vmware2.old/Makefile       Sun Apr 13 11:55:43 2003
      +++ vmware2/Makefile   Mon Sep  8 09:22:11 2003
      @@ -99,6 +99,8 @@
       .endif
       .if ${OSVERSION} >= 500027
             ${CAT} ${FILESDIR}/pmap.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
      +.elseif ${OSVERSION} < 500000 && ${OSVERSION} >= 480101
      +      ${CAT} ${FILESDIR}/pmap.patch-stable | (cd ${WRKSRC} && patch) > /dev/null 2>&1
       .endif
             ${CP} ${FILESDIR}/Makefile ${WRKSRC}
             ${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile
      diff -Nur vmware2.old/files/pmap.patch-stable vmware2/files/pmap.patch-stable
      --- vmware2.old/files/pmap.patch-stable        Thu Jan  1 01:00:00 1970
      +++ vmware2/files/pmap.patch-stable    Mon Sep  8 09:17:55 2003
      @@ -0,0 +1,16 @@
      +--- vmmon-only/freebsd/hostif.c.orig  Mon Sep  8 09:10:39 2003
      ++++ vmmon-only/freebsd/hostif.c       Mon Sep  8 09:11:28 2003
      +@@ -181,11 +181,11 @@
      + {
      + #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 = (pt_entry_t)vtopte((unsigned long) addr);
      +    PTE pte;
      + 
      +    DEB(printf("FindMPN: for page %d address %p(phys %p) pteptr %p", ppn, addr, (caddr_t)vtophys(addr), pteptr));
      +-   pte=*pteptr;
      ++   pte=*((caddr_t)pteptr);
      +    DEB(printf("(0x%08x)\n", pte));
      +    if (pte & PTE_P) { 
      +       return PTE_2_PFN(pte);