[src/trunk]: src/sys/arch/xen Use setter to set xenguest_handles.

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9cc8b36cd4f7
branches:  trunk
changeset: 779950:9cc8b36cd4f7
user:      jym <jym%NetBSD.org@localhost>
date:      Sat Jun 30 23:36:20 2012 +0000

description:
Use setter to set xenguest_handles.

diffstat:

 sys/arch/xen/x86/xen_bus_dma.c       |  10 +++++-----
 sys/arch/xen/xen/balloon.c           |   8 ++++----
 sys/arch/xen/xen/if_xennet_xenbus.c  |   9 +++++----
 sys/arch/xen/xen/xengnt.c            |   6 +++---
 sys/arch/xen/xen/xennetback_xenbus.c |   6 +++---
 5 files changed, 20 insertions(+), 19 deletions(-)

diffs (172 lines):

diff -r f97fa87e5935 -r 9cc8b36cd4f7 sys/arch/xen/x86/xen_bus_dma.c
--- a/sys/arch/xen/x86/xen_bus_dma.c    Sat Jun 30 23:33:10 2012 +0000
+++ b/sys/arch/xen/x86/xen_bus_dma.c    Sat Jun 30 23:36:20 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xen_bus_dma.c,v 1.25 2012/06/30 22:50:37 jym Exp $     */
+/*     $NetBSD: xen_bus_dma.c,v 1.26 2012/06/30 23:36:20 jym Exp $     */
 /*     NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */
 
 /*-
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.25 2012/06/30 22:50:37 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.26 2012/06/30 23:36:20 jym Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,7 @@
                pa = VM_PAGE_TO_PHYS(pg);
                mfn = xpmap_ptom(pa) >> PAGE_SHIFT;
                xpmap_ptom_unmap(pa);
-               xenguest_handle(res.extent_start) = &mfn;
+               set_xen_guest_handle(res.extent_start, &mfn);
                res.nr_extents = 1;
                res.extent_order = 0;
                res.address_bits = 0;
@@ -110,7 +110,7 @@
                }
        }
        /* Get the new contiguous memory extent */
-       xenguest_handle(res.extent_start) = &mfn;
+       set_xen_guest_handle(res.extent_start, &mfn);
        res.nr_extents = 1;
        res.extent_order = order;
        res.address_bits = get_order(high) + PAGE_SHIFT;
@@ -163,7 +163,7 @@
        s = splvm();
        for (pg = mlistp->tqh_first; pg != NULL; pg = pgnext) {
                pgnext = pg->pageq.queue.tqe_next;
-               xenguest_handle(res.extent_start) = &mfn;
+               set_xen_guest_handle(res.extent_start, &mfn);
                res.nr_extents = 1;
                res.extent_order = 0;
                res.address_bits = 32;
diff -r f97fa87e5935 -r 9cc8b36cd4f7 sys/arch/xen/xen/balloon.c
--- a/sys/arch/xen/xen/balloon.c        Sat Jun 30 23:33:10 2012 +0000
+++ b/sys/arch/xen/xen/balloon.c        Sat Jun 30 23:36:20 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: balloon.c,v 1.15 2012/06/30 22:50:37 jym Exp $ */
+/* $NetBSD: balloon.c,v 1.16 2012/06/30 23:36:20 jym Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
 #define BALLOONDEBUG 0
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: balloon.c,v 1.15 2012/06/30 22:50:37 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: balloon.c,v 1.16 2012/06/30 23:36:20 jym Exp $");
 
 #include <sys/inttypes.h>
 #include <sys/device.h>
@@ -407,7 +407,7 @@
        }
 
        /* Hand over pages to Hypervisor */
-       xenguest_handle(reservation.extent_start) = mfn_list;
+       set_xen_guest_handle(reservation.extent_start, mfn_list);
        reservation.nr_extents = rpages;
 
        s = splvm();
@@ -471,7 +471,7 @@
        }
 
        /* reclaim pages from balloon */
-       xenguest_handle(reservation.extent_start) = mfn_list;
+       set_xen_guest_handle(reservation.extent_start, mfn_list);
        reservation.nr_extents = tpages;
 
        s = splvm();
diff -r f97fa87e5935 -r 9cc8b36cd4f7 sys/arch/xen/xen/if_xennet_xenbus.c
--- a/sys/arch/xen/xen/if_xennet_xenbus.c       Sat Jun 30 23:33:10 2012 +0000
+++ b/sys/arch/xen/xen/if_xennet_xenbus.c       Sat Jun 30 23:36:20 2012 +0000
@@ -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 @@
                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 @@
                                         * 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;
diff -r f97fa87e5935 -r 9cc8b36cd4f7 sys/arch/xen/xen/xengnt.c
--- a/sys/arch/xen/xen/xengnt.c Sat Jun 30 23:33:10 2012 +0000
+++ b/sys/arch/xen/xen/xengnt.c Sat Jun 30 23:36:20 2012 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xengnt.c,v 1.23 2012/02/23 19:17:32 bouyer Exp $      */
+/*      $NetBSD: xengnt.c,v 1.24 2012/06/30 23:36:20 jym Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1.23 2012/02/23 19:17:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1.24 2012/06/30 23:36:20 jym Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -173,7 +173,7 @@
 
        setup.dom = DOMID_SELF;
        setup.nr_frames = nframes_new;
-       xenguest_handle(setup.frame_list) = pages;
+       set_xen_guest_handle(setup.frame_list, pages);
 
        /*
         * setup the grant table, made of nframes_new frames
diff -r f97fa87e5935 -r 9cc8b36cd4f7 sys/arch/xen/xen/xennetback_xenbus.c
--- a/sys/arch/xen/xen/xennetback_xenbus.c      Sat Jun 30 23:33:10 2012 +0000
+++ b/sys/arch/xen/xen/xennetback_xenbus.c      Sat Jun 30 23:36:20 2012 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.49 2012/06/30 22:50:37 jym Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.50 2012/06/30 23:36:20 jym Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.49 2012/06/30 22:50:37 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.50 2012/06/30 23:36:20 jym Exp $");
 
 #include "opt_xen.h"
 
@@ -672,7 +672,7 @@
        struct xen_memory_reservation res;
 
        /* get some new pages. */
-       xenguest_handle(res.extent_start) = mcl_pages;
+       set_xen_guest_handle(res.extent_start, mcl_pages);
        res.nr_extents = NB_XMIT_PAGES_BATCH;
        res.extent_order = 0;
        res.address_bits = 0;