Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/xen/xen/if_xennet_xenbus.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/xen/xen/if_xennet_xenbus.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- src/sys/arch/xen/xen/if_xennet_xenbus.c	2012/06/30 22:50:37	1.61
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c	2012/06/30 23:36:20	1.62
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_xennet_xenbus.c,v 1.61 2012/06/30 22:50:37 jym Exp $      */
+/*      $NetBSD: if_xennet_xenbus.c,v 1.62 2012/06/30 23:36:20 jym Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.61 2012/06/30 22:50:37 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.62 2012/06/30 23:36:20 jym Exp $");
 
 #include "opt_xen.h"
 #include "opt_nfs_boot.h"
@@ -754,7 +754,7 @@ out_loop:
 		xpq_flush_queue();
 		splx(s);
 		/* now decrease reservation */
-		xenguest_handle(reservation.extent_start) = xennet_pages;
+		set_xen_guest_handle(reservation.extent_start, xennet_pages);
 		reservation.nr_extents = i;
 		reservation.extent_order = 0;
 		reservation.address_bits = 0;
@@ -820,7 +820,8 @@ xennet_free_rx_buffer(struct xennet_xenb
 					 * transfer not complete, we lost the page.
 					 * Get one from hypervisor
 					 */
-					xenguest_handle(xenres.extent_start) = &pfn;
+					set_xen_guest_handle(
+					    xenres.extent_start, &pfn);
 					xenres.nr_extents = 1;
 					xenres.extent_order = 0;
 					xenres.address_bits = 31;