ia64/xen-unstable

changeset 9881:dfdc32a9814f

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>
author kaf24@firebug.cl.cam.ac.uk
date Fri Apr 28 09:40:07 2006 +0100 (2006-04-28)
parents 8bf5637cb269
children a8cac38001ca
files linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c linux-2.6-xen-sparse/drivers/xen/core/gnttab.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h tools/libxc/xc_domain.c tools/libxc/xc_hvm_build.c tools/libxc/xc_linux_build.c tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c tools/libxc/xc_misc.c tools/libxc/xc_private.c tools/xenstat/libxenstat/src/xen-interface.c xen/include/public/arch-ia64.h xen/include/public/arch-x86_32.h xen/include/public/arch-x86_64.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c	Fri Apr 28 08:30:52 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c	Fri Apr 28 09:40:07 2006 +0100
     1.3 @@ -70,7 +70,7 @@ static int do_microcode_update (void)
     1.4  		return err;
     1.5  
     1.6  	op.cmd = DOM0_MICROCODE;
     1.7 -	SET_XEN_GUEST_HANDLE(op.u.microcode.data, user_buffer);
     1.8 +	set_xen_guest_handle(op.u.microcode.data, user_buffer);
     1.9  	op.u.microcode.length = user_buffer_size;
    1.10  	err = HYPERVISOR_dom0_op(&op);
    1.11  
     2.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Fri Apr 28 08:30:52 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Fri Apr 28 09:40:07 2006 +0100
     2.3 @@ -1368,7 +1368,7 @@ legacy_init_iomem_resources(struct resou
     2.4  #ifdef CONFIG_XEN
     2.5  	map = alloc_bootmem_low_pages(PAGE_SIZE);
     2.6  	op.cmd = DOM0_PHYSICAL_MEMORY_MAP;
     2.7 -	SET_XEN_GUEST_HANDLE(op.u.physical_memory_map.memory_map, map);
     2.8 +	set_xen_guest_handle(op.u.physical_memory_map.memory_map, map);
     2.9  	op.u.physical_memory_map.max_map_entries =
    2.10  		PAGE_SIZE / sizeof(struct dom0_memory_map_entry);
    2.11  	BUG_ON(HYPERVISOR_dom0_op(&op));
     3.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Fri Apr 28 08:30:52 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Fri Apr 28 09:40:07 2006 +0100
     3.3 @@ -275,7 +275,7 @@ int xen_create_contiguous_region(
     3.4  		.extent_order = 0,
     3.5  		.domid        = DOMID_SELF
     3.6  	};
     3.7 -	SET_XEN_GUEST_HANDLE(reservation.extent_start, &frame);
     3.8 +	set_xen_guest_handle(reservation.extent_start, &frame);
     3.9  
    3.10  	/*
    3.11  	 * Currently an auto-translated guest will not perform I/O, nor will
    3.12 @@ -361,7 +361,7 @@ void xen_destroy_contiguous_region(unsig
    3.13  		.extent_order = 0,
    3.14  		.domid        = DOMID_SELF
    3.15  	};
    3.16 -	SET_XEN_GUEST_HANDLE(reservation.extent_start, &frame);
    3.17 +	set_xen_guest_handle(reservation.extent_start, &frame);
    3.18  
    3.19  	if (xen_feature(XENFEAT_auto_translated_physmap))
    3.20  		return;
     4.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c	Fri Apr 28 08:30:52 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c	Fri Apr 28 09:40:07 2006 +0100
     4.3 @@ -600,7 +600,7 @@ void __init e820_reserve_resources(void)
     4.4  
     4.5  	map = alloc_bootmem_low_pages(PAGE_SIZE);
     4.6  	op.cmd = DOM0_PHYSICAL_MEMORY_MAP;
     4.7 -	SET_XEN_GUEST_HANDLE(op.u.physical_memory_map.memory_map, map);
     4.8 +	set_xen_guest_handle(op.u.physical_memory_map.memory_map, map);
     4.9  	op.u.physical_memory_map.max_map_entries =
    4.10  		PAGE_SIZE / sizeof(struct dom0_memory_map_entry);
    4.11  	BUG_ON(HYPERVISOR_dom0_op(&op));
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Apr 28 08:30:52 2006 +0100
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Apr 28 09:40:07 2006 +0100
     5.3 @@ -195,14 +195,14 @@ static int increase_reservation(unsigned
     5.4  		page = balloon_next_page(page);
     5.5  	}
     5.6  
     5.7 -	SET_XEN_GUEST_HANDLE(reservation.extent_start, frame_list);
     5.8 +	set_xen_guest_handle(reservation.extent_start, frame_list);
     5.9  	reservation.nr_extents   = nr_pages;
    5.10  	rc = HYPERVISOR_memory_op(
    5.11  		XENMEM_populate_physmap, &reservation);
    5.12  	if (rc < nr_pages) {
    5.13  		int ret;
    5.14  		/* We hit the Xen hard limit: reprobe. */
    5.15 -		SET_XEN_GUEST_HANDLE(reservation.extent_start, frame_list);
    5.16 +		set_xen_guest_handle(reservation.extent_start, frame_list);
    5.17  		reservation.nr_extents   = rc;
    5.18  		ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
    5.19  				&reservation);
    5.20 @@ -309,7 +309,7 @@ static int decrease_reservation(unsigned
    5.21  		balloon_append(pfn_to_page(pfn));
    5.22  	}
    5.23  
    5.24 -	SET_XEN_GUEST_HANDLE(reservation.extent_start, frame_list);
    5.25 +	set_xen_guest_handle(reservation.extent_start, frame_list);
    5.26  	reservation.nr_extents   = nr_pages;
    5.27  	ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
    5.28  	BUG_ON(ret != nr_pages);
    5.29 @@ -527,7 +527,7 @@ static int dealloc_pte_fn(
    5.30  		.extent_order = 0,
    5.31  		.domid        = DOMID_SELF
    5.32  	};
    5.33 -	SET_XEN_GUEST_HANDLE(reservation.extent_start, &mfn);
    5.34 +	set_xen_guest_handle(reservation.extent_start, &mfn);
    5.35  	set_pte_at(&init_mm, addr, pte, __pte_ma(0));
    5.36  	set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY);
    5.37  	ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
     6.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Fri Apr 28 08:30:52 2006 +0100
     6.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Fri Apr 28 09:40:07 2006 +0100
     6.3 @@ -399,7 +399,7 @@ gnttab_resume(void)
     6.4  
     6.5  	setup.dom        = DOMID_SELF;
     6.6  	setup.nr_frames  = NR_GRANT_FRAMES;
     6.7 -	SET_XEN_GUEST_HANDLE(setup.frame_list, frames);
     6.8 +	set_xen_guest_handle(setup.frame_list, frames);
     6.9  
    6.10  	rc = HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1);
    6.11  	if (rc == -ENOSYS)
     7.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Fri Apr 28 08:30:52 2006 +0100
     7.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Fri Apr 28 09:40:07 2006 +0100
     7.3 @@ -109,7 +109,7 @@ static unsigned long alloc_mfn(void)
     7.4  		.extent_order = 0,
     7.5  		.domid        = DOMID_SELF
     7.6  	};
     7.7 -	SET_XEN_GUEST_HANDLE(reservation.extent_start, mfn_list);
     7.8 +	set_xen_guest_handle(reservation.extent_start, mfn_list);
     7.9  	spin_lock_irqsave(&mfn_lock, flags);
    7.10  	if ( unlikely(alloc_index == 0) )
    7.11  		alloc_index = HYPERVISOR_memory_op(
     8.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Apr 28 08:30:52 2006 +0100
     8.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Apr 28 09:40:07 2006 +0100
     8.3 @@ -607,7 +607,7 @@ static void network_alloc_rx_buffers(str
     8.4  	/* Tell the ballon driver what is going on. */
     8.5  	balloon_update_driver_allowance(i);
     8.6  
     8.7 -	SET_XEN_GUEST_HANDLE(reservation.extent_start, np->rx_pfn_array);
     8.8 +	set_xen_guest_handle(reservation.extent_start, np->rx_pfn_array);
     8.9  	reservation.nr_extents   = i;
    8.10  	reservation.extent_order = 0;
    8.11  	reservation.address_bits = 0;
     9.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h	Fri Apr 28 08:30:52 2006 +0100
     9.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h	Fri Apr 28 09:40:07 2006 +0100
     9.3 @@ -162,13 +162,12 @@ static inline int
     9.4  HYPERVISOR_poll(
     9.5  	evtchn_port_t *ports, unsigned int nr_ports, u64 timeout)
     9.6  {
     9.7 +	int rc;
     9.8  	struct sched_poll sched_poll = {
     9.9  		.nr_ports = nr_ports,
    9.10  		.timeout = jiffies_to_st(timeout)
    9.11  	};
    9.12 -	int rc;
    9.13 -
    9.14 -	SET_XEN_GUEST_HANDLE(sched_poll.ports, ports);
    9.15 +	set_xen_guest_handle(sched_poll.ports, ports);
    9.16  
    9.17  	rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll);
    9.18  	if (rc == -ENOSYS)
    10.1 --- a/tools/libxc/xc_domain.c	Fri Apr 28 08:30:52 2006 +0100
    10.2 +++ b/tools/libxc/xc_domain.c	Fri Apr 28 09:40:07 2006 +0100
    10.3 @@ -171,7 +171,7 @@ int xc_domain_getinfolist(int xc_handle,
    10.4      op.cmd = DOM0_GETDOMAININFOLIST;
    10.5      op.u.getdomaininfolist.first_domain = first_domain;
    10.6      op.u.getdomaininfolist.max_domains  = max_domains;
    10.7 -    SET_XEN_GUEST_HANDLE(op.u.getdomaininfolist.buffer, info);
    10.8 +    set_xen_guest_handle(op.u.getdomaininfolist.buffer, info);
    10.9  
   10.10      if ( xc_dom0_op(xc_handle, &op) < 0 )
   10.11          ret = -1;
   10.12 @@ -195,7 +195,7 @@ int xc_vcpu_getcontext(int xc_handle,
   10.13      op.cmd = DOM0_GETVCPUCONTEXT;
   10.14      op.u.getvcpucontext.domain = (domid_t)domid;
   10.15      op.u.getvcpucontext.vcpu   = (uint16_t)vcpu;
   10.16 -    SET_XEN_GUEST_HANDLE(op.u.getvcpucontext.ctxt, ctxt);
   10.17 +    set_xen_guest_handle(op.u.getvcpucontext.ctxt, ctxt);
   10.18  
   10.19      if ( (rc = mlock(ctxt, sizeof(*ctxt))) != 0 )
   10.20          return rc;
   10.21 @@ -220,7 +220,7 @@ int xc_shadow_control(int xc_handle,
   10.22      op.cmd = DOM0_SHADOW_CONTROL;
   10.23      op.u.shadow_control.domain = (domid_t)domid;
   10.24      op.u.shadow_control.op     = sop;
   10.25 -    SET_XEN_GUEST_HANDLE(op.u.shadow_control.dirty_bitmap, dirty_bitmap);
   10.26 +    set_xen_guest_handle(op.u.shadow_control.dirty_bitmap, dirty_bitmap);
   10.27      op.u.shadow_control.pages  = pages;
   10.28  
   10.29      rc = do_dom0_op(xc_handle, &op);
   10.30 @@ -302,7 +302,7 @@ int xc_domain_memory_increase_reservatio
   10.31      };
   10.32  
   10.33      /* may be NULL */
   10.34 -    SET_XEN_GUEST_HANDLE(reservation.extent_start, extent_start);
   10.35 +    set_xen_guest_handle(reservation.extent_start, extent_start);
   10.36  
   10.37      err = xc_memory_op(xc_handle, XENMEM_increase_reservation, &reservation);
   10.38      if ( err == nr_extents )
   10.39 @@ -334,7 +334,7 @@ int xc_domain_memory_decrease_reservatio
   10.40          .domid        = domid
   10.41      };
   10.42  
   10.43 -    SET_XEN_GUEST_HANDLE(reservation.extent_start, extent_start);
   10.44 +    set_xen_guest_handle(reservation.extent_start, extent_start);
   10.45  
   10.46      if ( extent_start == NULL )
   10.47      {
   10.48 @@ -372,7 +372,7 @@ int xc_domain_memory_populate_physmap(in
   10.49          .address_bits = address_bits,
   10.50          .domid        = domid
   10.51      };
   10.52 -    SET_XEN_GUEST_HANDLE(reservation.extent_start, extent_start);
   10.53 +    set_xen_guest_handle(reservation.extent_start, extent_start);
   10.54  
   10.55      err = xc_memory_op(xc_handle, XENMEM_populate_physmap, &reservation);
   10.56      if ( err == nr_extents )
   10.57 @@ -399,8 +399,8 @@ int xc_domain_translate_gpfn_list(int xc
   10.58          .domid        = domid,
   10.59          .nr_gpfns     = nr_gpfns,
   10.60      };
   10.61 -    SET_XEN_GUEST_HANDLE(op.gpfn_list, gpfn_list);
   10.62 -    SET_XEN_GUEST_HANDLE(op.mfn_list, mfn_list);
   10.63 +    set_xen_guest_handle(op.gpfn_list, gpfn_list);
   10.64 +    set_xen_guest_handle(op.mfn_list, mfn_list);
   10.65  
   10.66      return xc_memory_op(xc_handle, XENMEM_translate_gpfn_list, &op);
   10.67  }
   10.68 @@ -470,7 +470,7 @@ int xc_vcpu_setcontext(int xc_handle,
   10.69      op.cmd = DOM0_SETVCPUCONTEXT;
   10.70      op.u.setvcpucontext.domain = domid;
   10.71      op.u.setvcpucontext.vcpu = vcpu;
   10.72 -    SET_XEN_GUEST_HANDLE(op.u.setvcpucontext.ctxt, ctxt);
   10.73 +    set_xen_guest_handle(op.u.setvcpucontext.ctxt, ctxt);
   10.74  
   10.75      if ( (rc = mlock(ctxt, sizeof(*ctxt))) != 0 )
   10.76          return rc;
    11.1 --- a/tools/libxc/xc_hvm_build.c	Fri Apr 28 08:30:52 2006 +0100
    11.2 +++ b/tools/libxc/xc_hvm_build.c	Fri Apr 28 09:40:07 2006 +0100
    11.3 @@ -440,7 +440,7 @@ static int xc_hvm_build_internal(int xc_
    11.4  
    11.5      launch_op.u.setvcpucontext.domain = (domid_t)domid;
    11.6      launch_op.u.setvcpucontext.vcpu   = 0;
    11.7 -    SET_XEN_GUEST_HANDLE(launch_op.u.setvcpucontext.ctxt, ctxt);
    11.8 +    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
    11.9  
   11.10      launch_op.cmd = DOM0_SETVCPUCONTEXT;
   11.11      rc = xc_dom0_op(xc_handle, &launch_op);
    12.1 --- a/tools/libxc/xc_linux_build.c	Fri Apr 28 08:30:52 2006 +0100
    12.2 +++ b/tools/libxc/xc_linux_build.c	Fri Apr 28 09:40:07 2006 +0100
    12.3 @@ -1180,7 +1180,7 @@ static int xc_linux_build_internal(int x
    12.4  
    12.5      launch_op.u.setvcpucontext.domain = (domid_t)domid;
    12.6      launch_op.u.setvcpucontext.vcpu   = 0;
    12.7 -    SET_XEN_GUEST_HANDLE(launch_op.u.setvcpucontext.ctxt, ctxt);
    12.8 +    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
    12.9  
   12.10      launch_op.cmd = DOM0_SETVCPUCONTEXT;
   12.11      rc = xc_dom0_op(xc_handle, &launch_op);
    13.1 --- a/tools/libxc/xc_linux_restore.c	Fri Apr 28 08:30:52 2006 +0100
    13.2 +++ b/tools/libxc/xc_linux_restore.c	Fri Apr 28 09:40:07 2006 +0100
    13.3 @@ -587,7 +587,7 @@ int xc_linux_restore(int xc_handle, int 
    13.4                  .extent_order = 0,
    13.5                  .domid        = dom
    13.6              };
    13.7 -            SET_XEN_GUEST_HANDLE(reservation.extent_start, pfntab);
    13.8 +            set_xen_guest_handle(reservation.extent_start, pfntab);
    13.9  
   13.10              if ((rc = xc_memory_op(xc_handle, XENMEM_decrease_reservation,
   13.11                                     &reservation)) != count) {
   13.12 @@ -727,7 +727,7 @@ int xc_linux_restore(int xc_handle, int 
   13.13      op.cmd = DOM0_SETVCPUCONTEXT;
   13.14      op.u.setvcpucontext.domain = (domid_t)dom;
   13.15      op.u.setvcpucontext.vcpu   = 0;
   13.16 -    SET_XEN_GUEST_HANDLE(op.u.setvcpucontext.ctxt, &ctxt);
   13.17 +    set_xen_guest_handle(op.u.setvcpucontext.ctxt, &ctxt);
   13.18      rc = xc_dom0_op(xc_handle, &op);
   13.19  
   13.20      if (rc != 0) {
    14.1 --- a/tools/libxc/xc_linux_save.c	Fri Apr 28 08:30:52 2006 +0100
    14.2 +++ b/tools/libxc/xc_linux_save.c	Fri Apr 28 09:40:07 2006 +0100
    14.3 @@ -520,7 +520,7 @@ static unsigned long *xc_map_m2p(int xc_
    14.4          ERR("failed to allocate space for m2p mfns");
    14.5          return NULL;
    14.6      }
    14.7 -    SET_XEN_GUEST_HANDLE(xmml.extent_start, extent_start);
    14.8 +    set_xen_guest_handle(xmml.extent_start, extent_start);
    14.9  
   14.10      if (xc_memory_op(xc_handle, XENMEM_machphys_mfn_list, &xmml) ||
   14.11          (xmml.nr_extents != m2p_chunks)) {
    15.1 --- a/tools/libxc/xc_misc.c	Fri Apr 28 08:30:52 2006 +0100
    15.2 +++ b/tools/libxc/xc_misc.c	Fri Apr 28 09:40:07 2006 +0100
    15.3 @@ -30,7 +30,7 @@ int xc_readconsolering(int xc_handle,
    15.4      unsigned int nr_chars = *pnr_chars;
    15.5  
    15.6      op.cmd = DOM0_READCONSOLE;
    15.7 -    SET_XEN_GUEST_HANDLE(op.u.readconsole.buffer, buffer);
    15.8 +    set_xen_guest_handle(op.u.readconsole.buffer, buffer);
    15.9      op.u.readconsole.count  = nr_chars;
   15.10      op.u.readconsole.clear  = clear;
   15.11  
   15.12 @@ -88,7 +88,7 @@ int xc_perfc_control(int xc_handle,
   15.13  
   15.14      op.cmd = DOM0_PERFCCONTROL;
   15.15      op.u.perfccontrol.op   = opcode;
   15.16 -    SET_XEN_GUEST_HANDLE(op.u.perfccontrol.desc, desc);
   15.17 +    set_xen_guest_handle(op.u.perfccontrol.desc, desc);
   15.18  
   15.19      rc = do_dom0_op(xc_handle, &op);
   15.20  
    16.1 --- a/tools/libxc/xc_private.c	Fri Apr 28 08:30:52 2006 +0100
    16.2 +++ b/tools/libxc/xc_private.c	Fri Apr 28 09:40:07 2006 +0100
    16.3 @@ -71,7 +71,7 @@ int xc_get_pfn_type_batch(int xc_handle,
    16.4      op.cmd = DOM0_GETPAGEFRAMEINFO2;
    16.5      op.u.getpageframeinfo2.domain = (domid_t)dom;
    16.6      op.u.getpageframeinfo2.num    = num;
    16.7 -    SET_XEN_GUEST_HANDLE(op.u.getpageframeinfo2.array, arr);
    16.8 +    set_xen_guest_handle(op.u.getpageframeinfo2.array, arr);
    16.9      return do_dom0_op(xc_handle, &op);
   16.10  }
   16.11  
   16.12 @@ -210,7 +210,7 @@ int xc_memory_op(int xc_handle,
   16.13              PERROR("Could not mlock");
   16.14              goto out1;
   16.15          }
   16.16 -        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
   16.17 +        get_xen_guest_handle(extent_start, reservation->extent_start);
   16.18          if ( (extent_start != NULL) &&
   16.19               (mlock(extent_start,
   16.20                      reservation->nr_extents * sizeof(unsigned long)) != 0) )
   16.21 @@ -226,7 +226,7 @@ int xc_memory_op(int xc_handle,
   16.22              PERROR("Could not mlock");
   16.23              goto out1;
   16.24          }
   16.25 -        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
   16.26 +        get_xen_guest_handle(extent_start, xmml->extent_start);
   16.27          if ( mlock(extent_start,
   16.28                     xmml->max_extents * sizeof(unsigned long)) != 0 )
   16.29          {
   16.30 @@ -248,14 +248,14 @@ int xc_memory_op(int xc_handle,
   16.31              PERROR("Could not mlock");
   16.32              goto out1;
   16.33          }
   16.34 -        GET_XEN_GUEST_HANDLE(gpfn_list, trans->gpfn_list);
   16.35 +        get_xen_guest_handle(gpfn_list, trans->gpfn_list);
   16.36          if ( mlock(gpfn_list, trans->nr_gpfns * sizeof(long)) != 0 )
   16.37          {
   16.38              PERROR("Could not mlock");
   16.39              safe_munlock(trans, sizeof(*trans));
   16.40              goto out1;
   16.41          }
   16.42 -        GET_XEN_GUEST_HANDLE(mfn_list, trans->mfn_list);
   16.43 +        get_xen_guest_handle(mfn_list, trans->mfn_list);
   16.44          if ( mlock(mfn_list, trans->nr_gpfns * sizeof(long)) != 0 )
   16.45          {
   16.46              PERROR("Could not mlock");
   16.47 @@ -274,14 +274,14 @@ int xc_memory_op(int xc_handle,
   16.48      case XENMEM_decrease_reservation:
   16.49      case XENMEM_populate_physmap:
   16.50          safe_munlock(reservation, sizeof(*reservation));
   16.51 -        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
   16.52 +        get_xen_guest_handle(extent_start, reservation->extent_start);
   16.53          if ( extent_start != NULL )
   16.54              safe_munlock(extent_start,
   16.55                           reservation->nr_extents * sizeof(unsigned long));
   16.56          break;
   16.57      case XENMEM_machphys_mfn_list:
   16.58          safe_munlock(xmml, sizeof(*xmml));
   16.59 -        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
   16.60 +        get_xen_guest_handle(extent_start, xmml->extent_start);
   16.61          safe_munlock(extent_start,
   16.62                       xmml->max_extents * sizeof(unsigned long));
   16.63          break;
   16.64 @@ -289,9 +289,9 @@ int xc_memory_op(int xc_handle,
   16.65          safe_munlock(arg, sizeof(struct xen_add_to_physmap));
   16.66          break;
   16.67      case XENMEM_translate_gpfn_list:
   16.68 -            GET_XEN_GUEST_HANDLE(mfn_list, trans->mfn_list);
   16.69 +            get_xen_guest_handle(mfn_list, trans->mfn_list);
   16.70              safe_munlock(mfn_list, trans->nr_gpfns * sizeof(long));
   16.71 -            GET_XEN_GUEST_HANDLE(gpfn_list, trans->gpfn_list);
   16.72 +            get_xen_guest_handle(gpfn_list, trans->gpfn_list);
   16.73              safe_munlock(gpfn_list, trans->nr_gpfns * sizeof(long));
   16.74              safe_munlock(trans, sizeof(*trans));
   16.75          break;
   16.76 @@ -328,7 +328,7 @@ int xc_get_pfn_list(int xc_handle,
   16.77      op.cmd = DOM0_GETMEMLIST;
   16.78      op.u.getmemlist.domain   = (domid_t)domid;
   16.79      op.u.getmemlist.max_pfns = max_pfns;
   16.80 -    SET_XEN_GUEST_HANDLE(op.u.getmemlist.buffer, pfn_buf);
   16.81 +    set_xen_guest_handle(op.u.getmemlist.buffer, pfn_buf);
   16.82  
   16.83  #ifdef VALGRIND
   16.84      memset(pfn_buf, 0, max_pfns * sizeof(unsigned long));
    17.1 --- a/tools/xenstat/libxenstat/src/xen-interface.c	Fri Apr 28 08:30:52 2006 +0100
    17.2 +++ b/tools/xenstat/libxenstat/src/xen-interface.c	Fri Apr 28 09:40:07 2006 +0100
    17.3 @@ -155,7 +155,7 @@ int xi_get_domaininfolist(xi_handle *han
    17.4  	dom0_op_t op;
    17.5  	op.u.getdomaininfolist.first_domain = first_domain;
    17.6  	op.u.getdomaininfolist.max_domains = max_domains;
    17.7 -	SET_XEN_GUEST_HANDLE(op.u.getdomaininfolist.buffer, info);
    17.8 +	set_xen_guest_handle(op.u.getdomaininfolist.buffer, info);
    17.9  
   17.10  	if (mlock( info, max_domains * sizeof(dom0_getdomaininfo_t)) < 0) {
   17.11  		perror("Failed to mlock domaininfo array");
    18.1 --- a/xen/include/public/arch-ia64.h	Fri Apr 28 08:30:52 2006 +0100
    18.2 +++ b/xen/include/public/arch-ia64.h	Fri Apr 28 09:40:07 2006 +0100
    18.3 @@ -12,9 +12,9 @@
    18.4  
    18.5  #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
    18.6  #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
    18.7 -#define SET_XEN_GUEST_HANDLE(hnd, val)  do { (hnd).p = val; } while (0)
    18.8 +#define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
    18.9  #ifdef __XEN_TOOLS__
   18.10 -#define GET_XEN_GUEST_HANDLE(val, hnd)  do { val = (hnd).p; } while (0)
   18.11 +#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
   18.12  #endif
   18.13  
   18.14  #ifndef __ASSEMBLY__
    19.1 --- a/xen/include/public/arch-x86_32.h	Fri Apr 28 08:30:52 2006 +0100
    19.2 +++ b/xen/include/public/arch-x86_32.h	Fri Apr 28 09:40:07 2006 +0100
    19.3 @@ -14,9 +14,9 @@
    19.4  
    19.5  #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
    19.6  #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
    19.7 -#define SET_XEN_GUEST_HANDLE(hnd, val)  do { (hnd).p = val; } while (0)
    19.8 +#define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
    19.9  #ifdef __XEN_TOOLS__
   19.10 -#define GET_XEN_GUEST_HANDLE(val, hnd)  do { val = (hnd).p; } while (0)
   19.11 +#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
   19.12  #endif
   19.13  
   19.14  #ifndef __ASSEMBLY__
    20.1 --- a/xen/include/public/arch-x86_64.h	Fri Apr 28 08:30:52 2006 +0100
    20.2 +++ b/xen/include/public/arch-x86_64.h	Fri Apr 28 09:40:07 2006 +0100
    20.3 @@ -14,9 +14,9 @@
    20.4  
    20.5  #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
    20.6  #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
    20.7 -#define SET_XEN_GUEST_HANDLE(hnd, val)  do { (hnd).p = val; } while (0)
    20.8 +#define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
    20.9  #ifdef __XEN_TOOLS__
   20.10 -#define GET_XEN_GUEST_HANDLE(val, hnd)  do { val = (hnd).p; } while (0)
   20.11 +#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
   20.12  #endif
   20.13  
   20.14  #ifndef __ASSEMBLY__