From owner-p4-projects@FreeBSD.ORG  Tue Jan  1 06:33:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5490316A41B; Tue,  1 Jan 2008 06:33:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A60516A418
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 06:33:01 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0940413C457
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 06:33:01 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m016X0Jm015407
	for <perforce@freebsd.org>; Tue, 1 Jan 2008 06:33:00 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m016X0mx015402
	for perforce@freebsd.org; Tue, 1 Jan 2008 06:33:00 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 1 Jan 2008 06:33:00 GMT
Message-Id: <200801010633.m016X0mx015402@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132228 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jan 2008 06:33:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=132228

Change 132228 by kmacy@pandemonium:kmacy:xen31 on 2008/01/01 06:32:35

	update interface for replicating page directory updates to the 
	shadow page directory

Affected files ...

.. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#5 edit

Differences ...

==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#5 (text+ko) ====

@@ -82,7 +82,7 @@
 #define SH_PD_SET_VA_CLEAR  3
 
 struct pmap;
-void pd_set(struct pmap *pmap, vm_paddr_t *ptr, vm_paddr_t val, int type);
+void pd_set(struct pmap *pmap, int ptepindex, vm_paddr_t val, int type);
 #ifdef notyet
 static vm_paddr_t
 vptetomachpte(vm_paddr_t *pte)
@@ -158,19 +158,19 @@
 		xen_flush_queue();				\
 } while (/*CONSTCOND*/0)
 
-#define PD_SET_VA(_pmap, _ptp,_npte,sync) do {			\
+#define PD_SET_VA(_pmap, _ptepindex,_npte,sync) do {		\
         PMAP_REF((_ptp), xpmap_ptom(_npte));                    \
-        pd_set((_pmap),(_ptp),(_npte), SH_PD_SET_VA);           \
+        pd_set((_pmap),(_ptepindex),(_npte), SH_PD_SET_VA);     \
 	if (sync || ALWAYS_SYNC) xen_flush_queue();     	\
 } while (/*CONSTCOND*/0)
-#define PD_SET_VA_MA(_pmap, _ptp,_npte,sync) do {		\
+#define PD_SET_VA_MA(_pmap, _ptepindex,_npte,sync) do {		\
         PMAP_REF((_ptp), (_npte));                              \
-        pd_set((_pmap),(_ptp),(_npte), SH_PD_SET_VA_MA);        \
+        pd_set((_pmap),(_ptepindex),(_npte), SH_PD_SET_VA_MA);  \
 	if (sync || ALWAYS_SYNC) xen_flush_queue();		\
 } while (/*CONSTCOND*/0)
-#define PD_CLEAR_VA(_pmap, _ptp, sync) do {			\
+#define PD_CLEAR_VA(_pmap, _ptepindex, sync) do {		\
         PMAP_REF((pt_entry_t *)(_ptp), 0);                      \
-        pd_set((_pmap),(_ptp), 0, SH_PD_SET_VA_CLEAR);          \
+        pd_set((_pmap),(_ptepindex), 0, SH_PD_SET_VA_CLEAR);    \
 	if (sync || ALWAYS_SYNC) xen_flush_queue();		\
 } while (/*CONSTCOND*/0)
 
@@ -207,13 +207,13 @@
 static __inline vm_paddr_t
 xpmap_mtop(vm_paddr_t mpa)
 {
-    return machtophys(mpa) | (mpa & ~PG_FRAME);
+    return machtophys(mpa) | (mpa & PAGE_MASK);
 }
 
 static __inline vm_paddr_t
 xpmap_ptom(vm_paddr_t ppa)
 {
-    return phystomach(ppa) | (ppa & ~PG_FRAME);
+    return phystomach(ppa) | (ppa & PAGE_MASK);
 }
 
 #endif /* _XEN_XENPMAP_H_ */