From owner-freebsd-emulation  Wed Dec  5  0:26: 3 2001
Delivered-To: freebsd-emulation@freebsd.org
Received: from birch.ripe.net (birch.ripe.net [193.0.1.96])
	by hub.freebsd.org (Postfix) with ESMTP id C11CA37B416
	for <freebsd-emulation@FreeBSD.ORG>; Wed,  5 Dec 2001 00:25:58 -0800 (PST)
Received: from laptop.6bone.nl (penguin.ripe.net [193.0.1.232])
	by birch.ripe.net (8.11.6/8.11.6) with SMTP id fB58PiG14547;
	Wed, 5 Dec 2001 09:25:44 +0100
Received: (nullmailer pid 33659 invoked by uid 1000);
	Wed, 05 Dec 2001 08:25:44 -0000
Date: Wed, 5 Dec 2001 09:25:44 +0100
From: Mark Santcroos <marks@ripe.net>
To: Marcel Moolenaar <marcel@xcllnt.net>
Cc: "Vladimir N. Silyaev" <vsilyaev@mindspring.com>,
	freebsd-emulation@FreeBSD.ORG, Munehiro Matsuda <haro@h4.dion.ne.jp>
Subject: Re: vmware2 build fails on -current today
Message-ID: <20011205092544.M23525@laptop.6bone.nl>
References: <86zo5h3jys.fsf@gradius.wdb.co.kr> <20011121002047G.haro@h4.dion.ne.jp> <20011121170430.A710@laptop.6bone.nl> <20011204113250.E23525@laptop.6bone.nl> <20011204104522.B620@server-ext.vns.oc.ca.ua> <20011204225027.D628@dhcp01.pn.xcllnt.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <20011204225027.D628@dhcp01.pn.xcllnt.net>; from marcel@xcllnt.net on Tue, Dec 04, 2001 at 10:50:27PM -0800
X-Handles: MS6-6BONE, MS18417-RIPE
Sender: owner-freebsd-emulation@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-emulation.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-emulation>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-emulation>
X-Loop: FreeBSD.org

Marcel,

I think the OSVERSION to use for this can be 50027.
It got bumped to this at 10/10/2001. The pmap change was after that.

For the method, I don't think it is THAT ugly :) I can live with it.

Mark

On Tue, Dec 04, 2001 at 10:50:27PM -0800, Marcel Moolenaar wrote:
> On Tue, Dec 04, 2001 at 10:45:22AM -0800, Vladimir N. Silyaev wrote:
> > Sure, the patch looks good to me.
> > 
> > Unfortunatly I don't have commit priveleges, so probably Marcel
> > can help us.
> 
> Attached the complete diffs. I'm not really happy with it as it is,
> but I'm not sure if there's a better way that doesn't add too much
> complexity. Thoughts?
> 
> Index: Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/emulators/vmware2/Makefile,v
> retrieving revision 1.41
> diff -u -r1.41 Makefile
> --- Makefile    11 Nov 2001 08:36:28 -0000      1.41
> +++ Makefile    5 Dec 2001 04:47:11 -0000
> @@ -87,6 +87,7 @@
>  post-patch:
>  .if ${OSVERSION} >= 500023
>         cat ${FILESDIR}/kse.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
> +       cat ${FILESDIR}/pmap.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
>  .endif
>         ${CP} ${FILESDIR}/Makefile ${WRKSRC}
>         ${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile
> 
> 
> With pmap.patch as submitted:
> 
> --- 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));
> 
> -- 
>  Marcel Moolenaar	  USPA: A-39004		 marcel@xcllnt.net
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-emulation" in the body of the message

-- 
Mark Santcroos				RIPE Network Coordination Centre
http://www.ripe.net/home/mark/		New Projects Group/TTM

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-emulation" in the body of the message