Rename {SG}ET_XEN_GUEST_HANDLE to {sg}et_Xen_guest_handle, as they

are function macros rather than define/declare macros.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c
index 12d3ced3466ed4a87757bab8a5c43b2e91905ea0..65d6ff995e7ac2fa76f2f0e1d9210d5a7c47406a 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c
@@ -70,7 +70,7 @@ static int do_microcode_update (void)
                return err;
 
        op.cmd = DOM0_MICROCODE;
-       SET_XEN_GUEST_HANDLE(op.u.microcode.data, user_buffer);
+       set_xen_guest_handle(op.u.microcode.data, user_buffer);
        op.u.microcode.length = user_buffer_size;
        err = HYPERVISOR_dom0_op(&op);
 

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
index 617c71153d0583b5a4eff77fee9eec9db5c7993b..0921330bfeea20a4b044d2a75135606ab215bf50 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
@@ -1368,7 +1368,7 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
 #ifdef CONFIG_XEN
        map = alloc_bootmem_low_pages(PAGE_SIZE);
        op.cmd = DOM0_PHYSICAL_MEMORY_MAP;
-       SET_XEN_GUEST_HANDLE(op.u.physical_memory_map.memory_map, map);
+       set_xen_guest_handle(op.u.physical_memory_map.memory_map, map);
        op.u.physical_memory_map.max_map_entries =
                PAGE_SIZE / sizeof(struct dom0_memory_map_entry);
        BUG_ON(HYPERVISOR_dom0_op(&op));

diff --git a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
index 1281a88a205794e31b6ba36876b487dbf6f0f704..4a8f6d5bf71bcf4c91f49749a6e8f8d1c3aa5573 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
+++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
@@ -275,7 +275,7 @@ int xen_create_contiguous_region(
                .extent_order = 0,
                .domid        = DOMID_SELF
        };
-       SET_XEN_GUEST_HANDLE(reservation.extent_start, &frame);
+       set_xen_guest_handle(reservation.extent_start, &frame);
 
        /*
         * Currently an auto-translated guest will not perform I/O, nor will
@@ -361,7 +361,7 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order)
                .extent_order = 0,
                .domid        = DOMID_SELF
        };
-       SET_XEN_GUEST_HANDLE(reservation.extent_start, &frame);
+       set_xen_guest_handle(reservation.extent_start, &frame);
 
        if (xen_feature(XENFEAT_auto_translated_physmap))
                return;

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c
index 48940e71fed1f470056dfabbd5e6b4be77b7efc1..d8adccaa1c828f288c7da845e8cd875ec50c5ef8 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c
@@ -600,7 +600,7 @@ void __init e820_reserve_resources(void)
 
        map = alloc_bootmem_low_pages(PAGE_SIZE);
        op.cmd = DOM0_PHYSICAL_MEMORY_MAP;
-       SET_XEN_GUEST_HANDLE(op.u.physical_memory_map.memory_map, map);
+       set_xen_guest_handle(op.u.physical_memory_map.memory_map, map);
        op.u.physical_memory_map.max_map_entries =
                PAGE_SIZE / sizeof(struct dom0_memory_map_entry);
        BUG_ON(HYPERVISOR_dom0_op(&op));

diff --git a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
index 925de702f66cf87f4402c20b30d19191138120e2..dc335b5c3f131c8627e9714ccc3d1b3d460c365a 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
@@ -195,14 +195,14 @@ static int increase_reservation(unsigned long nr_pages)
                page = balloon_next_page(page);
        }
 
-       SET_XEN_GUEST_HANDLE(reservation.extent_start, frame_list);
+       set_xen_guest_handle(reservation.extent_start, frame_list);
        reservation.nr_extents   = nr_pages;
        rc = HYPERVISOR_memory_op(
                XENMEM_populate_physmap, &reservation);
        if (rc < nr_pages) {
                int ret;
                /* We hit the Xen hard limit: reprobe. */
-               SET_XEN_GUEST_HANDLE(reservation.extent_start, frame_list);
+               set_xen_guest_handle(reservation.extent_start, frame_list);
                reservation.nr_extents   = rc;
                ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
                                &reservation);
@@ -309,7 +309,7 @@ static int decrease_reservation(unsigned long nr_pages)
                balloon_append(pfn_to_page(pfn));
        }
 
-       SET_XEN_GUEST_HANDLE(reservation.extent_start, frame_list);
+       set_xen_guest_handle(reservation.extent_start, frame_list);
        reservation.nr_extents   = nr_pages;
        ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
        BUG_ON(ret != nr_pages);
@@ -527,7 +527,7 @@ static int dealloc_pte_fn(
                .extent_order = 0,
                .domid        = DOMID_SELF
        };
-       SET_XEN_GUEST_HANDLE(reservation.extent_start, &mfn);
+       set_xen_guest_handle(reservation.extent_start, &mfn);
        set_pte_at(&init_mm, addr, pte, __pte_ma(0));
        set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY);
        ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);

diff --git a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
index 868dbd154e7f480e30d9f6edf99b83555a7d6e0a..9215e6133f75163b918c1350fb39cfc24fad9e12 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
@@ -399,7 +399,7 @@ gnttab_resume(void)
 
        setup.dom        = DOMID_SELF;
        setup.nr_frames  = NR_GRANT_FRAMES;
-       SET_XEN_GUEST_HANDLE(setup.frame_list, frames);
+       set_xen_guest_handle(setup.frame_list, frames);
 
        rc = HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1);
        if (rc == -ENOSYS)

diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
index 37273ba81cc9310bef78f93f5f9dd18038ed61f6..c5ea3a8b24da4c6b808a2a20df7f78983228bdbf 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
@@ -109,7 +109,7 @@ static unsigned long alloc_mfn(void)
                .extent_order = 0,
                .domid        = DOMID_SELF
        };
-       SET_XEN_GUEST_HANDLE(reservation.extent_start, mfn_list);
+       set_xen_guest_handle(reservation.extent_start, mfn_list);
        spin_lock_irqsave(&mfn_lock, flags);
        if ( unlikely(alloc_index == 0) )
                alloc_index = HYPERVISOR_memory_op(

diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
index 6551e71a302858914dabd49f01334a82ab7f3221..b49c505f67dd22387ad6667657483c1fa14601e7 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
@@ -607,7 +607,7 @@ static void network_alloc_rx_buffers(struct net_device *dev)
        /* Tell the ballon driver what is going on. */
        balloon_update_driver_allowance(i);
 
-       SET_XEN_GUEST_HANDLE(reservation.extent_start, np->rx_pfn_array);
+       set_xen_guest_handle(reservation.extent_start, np->rx_pfn_array);
        reservation.nr_extents   = i;
        reservation.extent_order = 0;
        reservation.address_bits = 0;

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
index 8b5b393792af2c827739db116e3105e18e3b014e..8e135b40541b4932963c4d26bfdf2d59763d25e1 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
@@ -162,13 +162,12 @@ static inline int
 HYPERVISOR_poll(
        evtchn_port_t *ports, unsigned int nr_ports, u64 timeout)
 {
+       int rc;
        struct sched_poll sched_poll = {
                .nr_ports = nr_ports,
                .timeout = jiffies_to_st(timeout)
        };
-       int rc;
-
-       SET_XEN_GUEST_HANDLE(sched_poll.ports, ports);
+       set_xen_guest_handle(sched_poll.ports, ports);
 
        rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll);
        if (rc == -ENOSYS)

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 00512b96e21cff532a938e9b9a6ceee76b424329..6d51b23bcb4c839bca342ddd1f46fac206effbf5 100644 (file)
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -171,7 +171,7 @@ int xc_domain_getinfolist(int xc_handle,
     op.cmd = DOM0_GETDOMAININFOLIST;
     op.u.getdomaininfolist.first_domain = first_domain;
     op.u.getdomaininfolist.max_domains  = max_domains;
-    SET_XEN_GUEST_HANDLE(op.u.getdomaininfolist.buffer, info);
+    set_xen_guest_handle(op.u.getdomaininfolist.buffer, info);
 
     if ( xc_dom0_op(xc_handle, &op) < 0 )
         ret = -1;
@@ -195,7 +195,7 @@ int xc_vcpu_getcontext(int xc_handle,
     op.cmd = DOM0_GETVCPUCONTEXT;
     op.u.getvcpucontext.domain = (domid_t)domid;
     op.u.getvcpucontext.vcpu   = (uint16_t)vcpu;
-    SET_XEN_GUEST_HANDLE(op.u.getvcpucontext.ctxt, ctxt);
+    set_xen_guest_handle(op.u.getvcpucontext.ctxt, ctxt);
 
     if ( (rc = mlock(ctxt, sizeof(*ctxt))) != 0 )
         return rc;
@@ -220,7 +220,7 @@ int xc_shadow_control(int xc_handle,
     op.cmd = DOM0_SHADOW_CONTROL;
     op.u.shadow_control.domain = (domid_t)domid;
     op.u.shadow_control.op     = sop;
-    SET_XEN_GUEST_HANDLE(op.u.shadow_control.dirty_bitmap, dirty_bitmap);
+    set_xen_guest_handle(op.u.shadow_control.dirty_bitmap, dirty_bitmap);
     op.u.shadow_control.pages  = pages;
 
     rc = do_dom0_op(xc_handle, &op);
@@ -302,7 +302,7 @@ int xc_domain_memory_increase_reservation(int xc_handle,
     };
 
     /* may be NULL */
-    SET_XEN_GUEST_HANDLE(reservation.extent_start, extent_start);
+    set_xen_guest_handle(reservation.extent_start, extent_start);
 
     err = xc_memory_op(xc_handle, XENMEM_increase_reservation, &reservation);
     if ( err == nr_extents )
@@ -334,7 +334,7 @@ int xc_domain_memory_decrease_reservation(int xc_handle,
         .domid        = domid
     };
 
-    SET_XEN_GUEST_HANDLE(reservation.extent_start, extent_start);
+    set_xen_guest_handle(reservation.extent_start, extent_start);
 
     if ( extent_start == NULL )
     {
@@ -372,7 +372,7 @@ int xc_domain_memory_populate_physmap(int xc_handle,
         .address_bits = address_bits,
         .domid        = domid
     };
-    SET_XEN_GUEST_HANDLE(reservation.extent_start, extent_start);
+    set_xen_guest_handle(reservation.extent_start, extent_start);
 
     err = xc_memory_op(xc_handle, XENMEM_populate_physmap, &reservation);
     if ( err == nr_extents )
@@ -399,8 +399,8 @@ int xc_domain_translate_gpfn_list(int xc_handle,
         .domid        = domid,
         .nr_gpfns     = nr_gpfns,
     };
-    SET_XEN_GUEST_HANDLE(op.gpfn_list, gpfn_list);
-    SET_XEN_GUEST_HANDLE(op.mfn_list, mfn_list);
+    set_xen_guest_handle(op.gpfn_list, gpfn_list);
+    set_xen_guest_handle(op.mfn_list, mfn_list);
 
     return xc_memory_op(xc_handle, XENMEM_translate_gpfn_list, &op);
 }
@@ -470,7 +470,7 @@ int xc_vcpu_setcontext(int xc_handle,
     op.cmd = DOM0_SETVCPUCONTEXT;
     op.u.setvcpucontext.domain = domid;
     op.u.setvcpucontext.vcpu = vcpu;
-    SET_XEN_GUEST_HANDLE(op.u.setvcpucontext.ctxt, ctxt);
+    set_xen_guest_handle(op.u.setvcpucontext.ctxt, ctxt);
 
     if ( (rc = mlock(ctxt, sizeof(*ctxt))) != 0 )
         return rc;

diff --git a/tools/libxc/xc_hvm_build.c b/tools/libxc/xc_hvm_build.c
index a8348ca6dbbd4b5460b8e9d9868269fea34e9a4e..3cf9d276cd5ae85b0233c3c3adf5c3ff62968637 100644 (file)
--- a/tools/libxc/xc_hvm_build.c
+++ b/tools/libxc/xc_hvm_build.c
@@ -440,7 +440,7 @@ static int xc_hvm_build_internal(int xc_handle,
 
     launch_op.u.setvcpucontext.domain = (domid_t)domid;
     launch_op.u.setvcpucontext.vcpu   = 0;
-    SET_XEN_GUEST_HANDLE(launch_op.u.setvcpucontext.ctxt, ctxt);
+    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
 
     launch_op.cmd = DOM0_SETVCPUCONTEXT;
     rc = xc_dom0_op(xc_handle, &launch_op);

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index a4a768dd286cd7d9db8eb4dd229105fd606cf7f0..4c0d655855f6a65bf073b8c49e9bb418346f655d 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -1180,7 +1180,7 @@ static int xc_linux_build_internal(int xc_handle,
 
     launch_op.u.setvcpucontext.domain = (domid_t)domid;
     launch_op.u.setvcpucontext.vcpu   = 0;
-    SET_XEN_GUEST_HANDLE(launch_op.u.setvcpucontext.ctxt, ctxt);
+    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
 
     launch_op.cmd = DOM0_SETVCPUCONTEXT;
     rc = xc_dom0_op(xc_handle, &launch_op);

diff --git a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c
index e88d06d6a6f830f3f5b6e54059bd847e612772d9..9bf283652c6fe6267cb7e28092e87fda75edbe65 100644 (file)
--- a/tools/libxc/xc_linux_restore.c
+++ b/tools/libxc/xc_linux_restore.c
@@ -587,7 +587,7 @@ int xc_linux_restore(int xc_handle, int io_fd,
                 .extent_order = 0,
                 .domid        = dom
             };
-            SET_XEN_GUEST_HANDLE(reservation.extent_start, pfntab);
+            set_xen_guest_handle(reservation.extent_start, pfntab);
 
             if ((rc = xc_memory_op(xc_handle, XENMEM_decrease_reservation,
                                    &reservation)) != count) {
@@ -727,7 +727,7 @@ int xc_linux_restore(int xc_handle, int io_fd,
     op.cmd = DOM0_SETVCPUCONTEXT;
     op.u.setvcpucontext.domain = (domid_t)dom;
     op.u.setvcpucontext.vcpu   = 0;
-    SET_XEN_GUEST_HANDLE(op.u.setvcpucontext.ctxt, &ctxt);
+    set_xen_guest_handle(op.u.setvcpucontext.ctxt, &ctxt);
     rc = xc_dom0_op(xc_handle, &op);
 
     if (rc != 0) {

diff --git a/tools/libxc/xc_linux_save.c b/tools/libxc/xc_linux_save.c
index 797cd0139397f765960d2c98d3bdf8a7e3b8a07b..4223342703f2708f0b199478c0e08f07ebee993b 100644 (file)
--- a/tools/libxc/xc_linux_save.c
+++ b/tools/libxc/xc_linux_save.c
@@ -520,7 +520,7 @@ static unsigned long *xc_map_m2p(int xc_handle,
         ERR("failed to allocate space for m2p mfns");
         return NULL;
     }
-    SET_XEN_GUEST_HANDLE(xmml.extent_start, extent_start);
+    set_xen_guest_handle(xmml.extent_start, extent_start);
 
     if (xc_memory_op(xc_handle, XENMEM_machphys_mfn_list, &xmml) ||
         (xmml.nr_extents != m2p_chunks)) {

diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index f38a9ff6d8015a4c2ff8ddd9d6e7dfcacd88eff8..5da4db8074647a47e02fc8cec238fb6b2a035d28 100644 (file)
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -30,7 +30,7 @@ int xc_readconsolering(int xc_handle,
     unsigned int nr_chars = *pnr_chars;
 
     op.cmd = DOM0_READCONSOLE;
-    SET_XEN_GUEST_HANDLE(op.u.readconsole.buffer, buffer);
+    set_xen_guest_handle(op.u.readconsole.buffer, buffer);
     op.u.readconsole.count  = nr_chars;
     op.u.readconsole.clear  = clear;
 
@@ -88,7 +88,7 @@ int xc_perfc_control(int xc_handle,
 
     op.cmd = DOM0_PERFCCONTROL;
     op.u.perfccontrol.op   = opcode;
-    SET_XEN_GUEST_HANDLE(op.u.perfccontrol.desc, desc);
+    set_xen_guest_handle(op.u.perfccontrol.desc, desc);
 
     rc = do_dom0_op(xc_handle, &op);
 

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index b507a2b794160f0e3be729660fced4446d92a4dc..c44ce2b0ec98cc8e726a91dad60afc0b35741482 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -71,7 +71,7 @@ int xc_get_pfn_type_batch(int xc_handle,
     op.cmd = DOM0_GETPAGEFRAMEINFO2;
     op.u.getpageframeinfo2.domain = (domid_t)dom;
     op.u.getpageframeinfo2.num    = num;
-    SET_XEN_GUEST_HANDLE(op.u.getpageframeinfo2.array, arr);
+    set_xen_guest_handle(op.u.getpageframeinfo2.array, arr);
     return do_dom0_op(xc_handle, &op);
 }
 
@@ -210,7 +210,7 @@ int xc_memory_op(int xc_handle,
             PERROR("Could not mlock");
             goto out1;
         }
-        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
+        get_xen_guest_handle(extent_start, reservation->extent_start);
         if ( (extent_start != NULL) &&
              (mlock(extent_start,
                     reservation->nr_extents * sizeof(unsigned long)) != 0) )
@@ -226,7 +226,7 @@ int xc_memory_op(int xc_handle,
             PERROR("Could not mlock");
             goto out1;
         }
-        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
+        get_xen_guest_handle(extent_start, xmml->extent_start);
         if ( mlock(extent_start,
                    xmml->max_extents * sizeof(unsigned long)) != 0 )
         {
@@ -248,14 +248,14 @@ int xc_memory_op(int xc_handle,
             PERROR("Could not mlock");
             goto out1;
         }
-        GET_XEN_GUEST_HANDLE(gpfn_list, trans->gpfn_list);
+        get_xen_guest_handle(gpfn_list, trans->gpfn_list);
         if ( mlock(gpfn_list, trans->nr_gpfns * sizeof(long)) != 0 )
         {
             PERROR("Could not mlock");
             safe_munlock(trans, sizeof(*trans));
             goto out1;
         }
-        GET_XEN_GUEST_HANDLE(mfn_list, trans->mfn_list);
+        get_xen_guest_handle(mfn_list, trans->mfn_list);
         if ( mlock(mfn_list, trans->nr_gpfns * sizeof(long)) != 0 )
         {
             PERROR("Could not mlock");
@@ -274,14 +274,14 @@ int xc_memory_op(int xc_handle,
     case XENMEM_decrease_reservation:
     case XENMEM_populate_physmap:
         safe_munlock(reservation, sizeof(*reservation));
-        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
+        get_xen_guest_handle(extent_start, reservation->extent_start);
         if ( extent_start != NULL )
             safe_munlock(extent_start,
                          reservation->nr_extents * sizeof(unsigned long));
         break;
     case XENMEM_machphys_mfn_list:
         safe_munlock(xmml, sizeof(*xmml));
-        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
+        get_xen_guest_handle(extent_start, xmml->extent_start);
         safe_munlock(extent_start,
                      xmml->max_extents * sizeof(unsigned long));
         break;
@@ -289,9 +289,9 @@ int xc_memory_op(int xc_handle,
         safe_munlock(arg, sizeof(struct xen_add_to_physmap));
         break;
     case XENMEM_translate_gpfn_list:
-            GET_XEN_GUEST_HANDLE(mfn_list, trans->mfn_list);
+            get_xen_guest_handle(mfn_list, trans->mfn_list);
             safe_munlock(mfn_list, trans->nr_gpfns * sizeof(long));
-            GET_XEN_GUEST_HANDLE(gpfn_list, trans->gpfn_list);
+            get_xen_guest_handle(gpfn_list, trans->gpfn_list);
             safe_munlock(gpfn_list, trans->nr_gpfns * sizeof(long));
             safe_munlock(trans, sizeof(*trans));
         break;
@@ -328,7 +328,7 @@ int xc_get_pfn_list(int xc_handle,
     op.cmd = DOM0_GETMEMLIST;
     op.u.getmemlist.domain   = (domid_t)domid;
     op.u.getmemlist.max_pfns = max_pfns;
-    SET_XEN_GUEST_HANDLE(op.u.getmemlist.buffer, pfn_buf);
+    set_xen_guest_handle(op.u.getmemlist.buffer, pfn_buf);
 
 #ifdef VALGRIND
     memset(pfn_buf, 0, max_pfns * sizeof(unsigned long));

diff --git a/tools/xenstat/libxenstat/src/xen-interface.c b/tools/xenstat/libxenstat/src/xen-interface.c
index 3d36d8a999be51fae36757239196cc9b6b04c5ee..477e9f78ad3cf71cb67feabb0a899703dc425ba9 100644 (file)
--- a/tools/xenstat/libxenstat/src/xen-interface.c
+++ b/tools/xenstat/libxenstat/src/xen-interface.c
@@ -155,7 +155,7 @@ int xi_get_domaininfolist(xi_handle *handle, dom0_getdomaininfo_t *info,
        dom0_op_t op;
        op.u.getdomaininfolist.first_domain = first_domain;
        op.u.getdomaininfolist.max_domains = max_domains;
-       SET_XEN_GUEST_HANDLE(op.u.getdomaininfolist.buffer, info);
+       set_xen_guest_handle(op.u.getdomaininfolist.buffer, info);
 
        if (mlock( info, max_domains * sizeof(dom0_getdomaininfo_t)) < 0) {
                perror("Failed to mlock domaininfo array");

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index 358b16414de40d241eb20d48d7955af7d23163be..018a8febff7597725e25b24ea3cbbae7d3bcedd3 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -12,9 +12,9 @@
 
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
-#define SET_XEN_GUEST_HANDLE(hnd, val)  do { (hnd).p = val; } while (0)
+#define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
 #ifdef __XEN_TOOLS__
-#define GET_XEN_GUEST_HANDLE(val, hnd)  do { val = (hnd).p; } while (0)
+#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
 #endif
 
 #ifndef __ASSEMBLY__

diff --git a/xen/include/public/arch-x86_32.h b/xen/include/public/arch-x86_32.h
index 1f8b98baaa6bf2a80233576a2fee92ed67ec8745..27b6cf49a33fd992fb3ac8d16303447b3b57e747 100644 (file)
--- a/xen/include/public/arch-x86_32.h
+++ b/xen/include/public/arch-x86_32.h
@@ -14,9 +14,9 @@
 
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
-#define SET_XEN_GUEST_HANDLE(hnd, val)  do { (hnd).p = val; } while (0)
+#define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
 #ifdef __XEN_TOOLS__
-#define GET_XEN_GUEST_HANDLE(val, hnd)  do { val = (hnd).p; } while (0)
+#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
 #endif
 
 #ifndef __ASSEMBLY__

diff --git a/xen/include/public/arch-x86_64.h b/xen/include/public/arch-x86_64.h
index 1fce53bdadd627b1b0f0fdb35d426df42cc9e303..b1246c150fb30ae5cdaf766982548c10331870cb 100644 (file)
--- a/xen/include/public/arch-x86_64.h
+++ b/xen/include/public/arch-x86_64.h
@@ -14,9 +14,9 @@
 
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
-#define SET_XEN_GUEST_HANDLE(hnd, val)  do { (hnd).p = val; } while (0)
+#define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
 #ifdef __XEN_TOOLS__
-#define GET_XEN_GUEST_HANDLE(val, hnd)  do { val = (hnd).p; } while (0)
+#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
 #endif
 
 #ifndef __ASSEMBLY__