Update xen/interface includes to the latest in mercurial

MFC after:	1 month

2 files changed, 10 insertions, 6 deletions

diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 17202b1..3bdc4f8 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -411,6 +411,8 @@ static void backend_changed(struct xenbus_device *dev,
 	case XenbusStateInitWait:
 	case XenbusStateInitialised:
 	case XenbusStateClosed:
+	case XenbusStateReconfigured:
+	case XenbusStateReconfiguring:
 		break;
 
 	case XenbusStateConnected:
@@ -892,7 +894,7 @@ blkif_free(struct blkfront_info *info, int suspend)
 
 	/* Free resources associated with old device channel. */
 	if (info->ring_ref != GRANT_INVALID_REF) {
-		gnttab_end_foreign_access(info->ring_ref, 0,
+		gnttab_end_foreign_access(info->ring_ref, 
 					  info->ring.sring);
 		info->ring_ref = GRANT_INVALID_REF;
 		info->ring.sring = NULL;
@@ -909,7 +911,7 @@ blkif_completion(struct blk_shadow *s)
 	int i;
 
 	for (i = 0; i < s->req.nr_segments; i++)
-		gnttab_end_foreign_access(s->req.seg[i].gref, 0, 0UL);
+		gnttab_end_foreign_access(s->req.seg[i].gref, 0UL);
 }
 
 static void 
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index fed3f05..748c8a7 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -601,6 +601,8 @@ backend_changed(struct xenbus_device *dev,
 	case XenbusStateConnected:
 	case XenbusStateUnknown:
 	case XenbusStateClosed:
+	case XenbusStateReconfigured:
+	case XenbusStateReconfiguring:
 			break;
 	case XenbusStateInitWait:
 		if (dev->state != XenbusStateInitialising)
@@ -801,7 +803,7 @@ refill:
 		/* Tell the ballon driver what is going on. */
 		balloon_update_driver_allowance(i);
 #endif
-		reservation.extent_start = sc->rx_pfn_array;
+		set_xen_guest_handle(reservation.extent_start, sc->rx_pfn_array);
 		reservation.nr_extents   = i;
 		reservation.extent_order = 0;
 		reservation.address_bits = 0;
@@ -994,7 +996,7 @@ xn_txeof(struct netfront_info *np)
 				goto out; 
 			}
 			gnttab_end_foreign_access_ref(
-				np->grant_tx_ref[id], GNTMAP_readonly);
+				np->grant_tx_ref[id]);
 			gnttab_release_grant_reference(
 				&np->gref_tx_head, np->grant_tx_ref[id]);
 			np->grant_tx_ref[id] = GRANT_INVALID_REF;
@@ -1221,7 +1223,7 @@ xennet_get_responses(struct netfront_info *np,
 			}
 			pages_flipped++;
 		} else {
-			ret = gnttab_end_foreign_access_ref(ref, 0);
+			ret = gnttab_end_foreign_access_ref(ref);
 			KASSERT(ret, ("ret != 0"));
 		}
 
@@ -1797,7 +1799,7 @@ static void netif_disconnect_backend(struct netfront_info *info)
 static void end_access(int ref, void *page)
 {
 	if (ref != GRANT_INVALID_REF)
-		gnttab_end_foreign_access(ref, 0, page);
+		gnttab_end_foreign_access(ref, page);
 }