# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID dfdc32a9814f174fb6f4022b7598cd6a811f5e2d
# Parent 8bf5637cb269ba6bbc2a712824d2982930224405
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@xxxxxxxxxxxxx>
diff -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c Fri Apr 28
08:30:52 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c Fri Apr 28
09:40:07 2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Fri Apr 28 08:30:52
2006 +0100
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Fri Apr 28 09:40:07
2006 +0100
@@ -1368,7 +1368,7 @@ legacy_init_iomem_resources(struct resou
#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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c Fri Apr 28 08:30:52
2006 +0100
+++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c Fri Apr 28 09:40:07
2006 +0100
@@ -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(unsig
.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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c Fri Apr 28
08:30:52 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c Fri Apr 28
09:40:07 2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c Fri Apr 28
08:30:52 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c Fri Apr 28
09:40:07 2006 +0100
@@ -195,14 +195,14 @@ static int increase_reservation(unsigned
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
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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c Fri Apr 28 08:30:52
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c Fri Apr 28 09:40:07
2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/drivers/xen/netback/netback.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c Fri Apr 28
08:30:52 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c Fri Apr 28
09:40:07 2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Fri Apr 28
08:30:52 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Fri Apr 28
09:40:07 2006 +0100
@@ -607,7 +607,7 @@ static void network_alloc_rx_buffers(str
/* 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 -r 8bf5637cb269 -r dfdc32a9814f
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h Fri Apr
28 08:30:52 2006 +0100
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h Fri Apr
28 09:40:07 2006 +0100
@@ -162,13 +162,12 @@ HYPERVISOR_poll(
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 -r 8bf5637cb269 -r dfdc32a9814f tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c Fri Apr 28 08:30:52 2006 +0100
+++ b/tools/libxc/xc_domain.c Fri Apr 28 09:40:07 2006 +0100
@@ -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_reservatio
};
/* 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_reservatio
.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(in
.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
.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 -r 8bf5637cb269 -r dfdc32a9814f tools/libxc/xc_hvm_build.c
--- a/tools/libxc/xc_hvm_build.c Fri Apr 28 08:30:52 2006 +0100
+++ b/tools/libxc/xc_hvm_build.c Fri Apr 28 09:40:07 2006 +0100
@@ -440,7 +440,7 @@ static int xc_hvm_build_internal(int xc_
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 -r 8bf5637cb269 -r dfdc32a9814f tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c Fri Apr 28 08:30:52 2006 +0100
+++ b/tools/libxc/xc_linux_build.c Fri Apr 28 09:40:07 2006 +0100
@@ -1180,7 +1180,7 @@ static int xc_linux_build_internal(int x
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 -r 8bf5637cb269 -r dfdc32a9814f tools/libxc/xc_linux_restore.c
--- a/tools/libxc/xc_linux_restore.c Fri Apr 28 08:30:52 2006 +0100
+++ b/tools/libxc/xc_linux_restore.c Fri Apr 28 09:40:07 2006 +0100
@@ -587,7 +587,7 @@ int xc_linux_restore(int xc_handle, int
.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
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 -r 8bf5637cb269 -r dfdc32a9814f tools/libxc/xc_linux_save.c
--- a/tools/libxc/xc_linux_save.c Fri Apr 28 08:30:52 2006 +0100
+++ b/tools/libxc/xc_linux_save.c Fri Apr 28 09:40:07 2006 +0100
@@ -520,7 +520,7 @@ static unsigned long *xc_map_m2p(int xc_
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 -r 8bf5637cb269 -r dfdc32a9814f tools/libxc/xc_misc.c
--- a/tools/libxc/xc_misc.c Fri Apr 28 08:30:52 2006 +0100
+++ b/tools/libxc/xc_misc.c Fri Apr 28 09:40:07 2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c Fri Apr 28 08:30:52 2006 +0100
+++ b/tools/libxc/xc_private.c Fri Apr 28 09:40:07 2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f
tools/xenstat/libxenstat/src/xen-interface.c
--- a/tools/xenstat/libxenstat/src/xen-interface.c Fri Apr 28 08:30:52
2006 +0100
+++ b/tools/xenstat/libxenstat/src/xen-interface.c Fri Apr 28 09:40:07
2006 +0100
@@ -155,7 +155,7 @@ int xi_get_domaininfolist(xi_handle *han
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 -r 8bf5637cb269 -r dfdc32a9814f xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h Fri Apr 28 08:30:52 2006 +0100
+++ b/xen/include/public/arch-ia64.h Fri Apr 28 09:40:07 2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f xen/include/public/arch-x86_32.h
--- a/xen/include/public/arch-x86_32.h Fri Apr 28 08:30:52 2006 +0100
+++ b/xen/include/public/arch-x86_32.h Fri Apr 28 09:40:07 2006 +0100
@@ -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 -r 8bf5637cb269 -r dfdc32a9814f xen/include/public/arch-x86_64.h
--- a/xen/include/public/arch-x86_64.h Fri Apr 28 08:30:52 2006 +0100
+++ b/xen/include/public/arch-x86_64.h Fri Apr 28 09:40:07 2006 +0100
@@ -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__
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home