From owner-freebsd-emulation  Tue Dec  4 22:50:36 2001
Delivered-To: freebsd-emulation@freebsd.org
Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226])
	by hub.freebsd.org (Postfix) with ESMTP id BBF6937B417
	for <freebsd-emulation@FreeBSD.ORG>; Tue,  4 Dec 2001 22:50:22 -0800 (PST)
Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201])
	by kayak.xcllnt.net (8.11.6/8.11.4) with ESMTP id fB56oKQ05218;
	Tue, 4 Dec 2001 22:50:20 -0800 (PST)
	(envelope-from marcel@kayak.pn.xcllnt.net)
Received: (from marcel@localhost)
	by dhcp01.pn.xcllnt.net (8.11.6/8.11.6) id fB56oRb03243;
	Tue, 4 Dec 2001 22:50:27 -0800 (PST)
	(envelope-from marcel)
Date: Tue, 4 Dec 2001 22:50:27 -0800
From: Marcel Moolenaar <marcel@xcllnt.net>
To: "Vladimir N. Silyaev" <vsilyaev@mindspring.com>
Cc: Mark Santcroos <marks@ripe.net>, freebsd-emulation@FreeBSD.ORG,
	Munehiro Matsuda <haro@h4.dion.ne.jp>
Subject: Re: vmware2 build fails on -current today
Message-ID: <20011204225027.D628@dhcp01.pn.xcllnt.net>
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>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20011204104522.B620@server-ext.vns.oc.ca.ua>
User-Agent: Mutt/1.3.21i
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

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