ia64/xen-unstable

changeset 9873:4e1b8be54311

Rename *GUEST_HANDLE to *XEN_GUEST_HANDLE.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Apr 27 13:38:21 2006 +0100 (2006-04-27)
parents a898a6510c5d
children ec61a8c25429
files xen/arch/ia64/xen/dom0_ops.c xen/arch/ia64/xen/hypercall.c xen/arch/x86/dom0_ops.c xen/arch/x86/domain.c xen/arch/x86/mm.c xen/arch/x86/oprofile/xenoprof.c xen/arch/x86/physdev.c xen/arch/x86/traps.c xen/arch/x86/x86_32/mm.c xen/arch/x86/x86_32/traps.c xen/arch/x86/x86_64/mm.c xen/arch/x86/x86_64/traps.c xen/common/acm_ops.c xen/common/dom0_ops.c xen/common/domain.c xen/common/event_channel.c xen/common/grant_table.c xen/common/kernel.c xen/common/memory.c xen/common/multicall.c xen/common/perfc.c xen/common/schedule.c xen/drivers/char/console.c xen/include/asm-ia64/guest_access.h xen/include/asm-x86/guest_access.h xen/include/asm-x86/hypercall.h xen/include/asm-x86/mm.h xen/include/public/acm_ops.h xen/include/public/arch-ia64.h xen/include/public/arch-x86_32.h xen/include/public/arch-x86_64.h xen/include/public/callback.h xen/include/public/dom0_ops.h xen/include/public/event_channel.h xen/include/public/grant_table.h xen/include/public/memory.h xen/include/public/nmi.h xen/include/public/physdev.h xen/include/public/sched.h xen/include/public/xen.h xen/include/public/xenoprof.h xen/include/xen/console.h xen/include/xen/hypercall.h xen/include/xen/sched.h
line diff
     1.1 --- a/xen/arch/ia64/xen/dom0_ops.c	Thu Apr 27 09:56:21 2006 +0100
     1.2 +++ b/xen/arch/ia64/xen/dom0_ops.c	Thu Apr 27 13:38:21 2006 +0100
     1.3 @@ -20,7 +20,7 @@
     1.4  #include <public/sched_ctl.h>
     1.5  #include <asm/vmx.h>
     1.6  extern unsigned long total_pages;
     1.7 -long arch_do_dom0_op(dom0_op_t *op, GUEST_HANDLE(dom0_op_t) u_dom0_op)
     1.8 +long arch_do_dom0_op(dom0_op_t *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
     1.9  {
    1.10      long ret = 0;
    1.11  
     2.1 --- a/xen/arch/ia64/xen/hypercall.c	Thu Apr 27 09:56:21 2006 +0100
     2.2 +++ b/xen/arch/ia64/xen/hypercall.c	Thu Apr 27 13:38:21 2006 +0100
     2.3 @@ -27,7 +27,7 @@
     2.4  #include <xen/domain.h>
     2.5  
     2.6  extern unsigned long translate_domain_mpaddr(unsigned long);
     2.7 -static long do_physdev_op(GUEST_HANDLE(physdev_op_t) uop);
     2.8 +static long do_physdev_op(XEN_GUEST_HANDLE(physdev_op_t) uop);
     2.9  /* FIXME: where these declarations should be there ? */
    2.10  extern int dump_privop_counts_to_user(char *, int);
    2.11  extern int zero_privop_counts_to_user(char *, int);
    2.12 @@ -330,7 +330,7 @@ extern int
    2.13  iosapic_guest_write(
    2.14      unsigned long physbase, unsigned int reg, u32 pval);
    2.15  
    2.16 -static long do_physdev_op(GUEST_HANDLE(physdev_op_t) uop)
    2.17 +static long do_physdev_op(XEN_GUEST_HANDLE(physdev_op_t) uop)
    2.18  {
    2.19      struct physdev_op op;
    2.20      long ret;
     3.1 --- a/xen/arch/x86/dom0_ops.c	Thu Apr 27 09:56:21 2006 +0100
     3.2 +++ b/xen/arch/x86/dom0_ops.c	Thu Apr 27 13:38:21 2006 +0100
     3.3 @@ -49,7 +49,7 @@ static void read_msr_for(void *unused)
     3.4          (void)rdmsr_safe(msr_addr, msr_lo, msr_hi);
     3.5  }
     3.6  
     3.7 -long arch_do_dom0_op(struct dom0_op *op, GUEST_HANDLE(dom0_op_t) u_dom0_op)
     3.8 +long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
     3.9  {
    3.10      long ret = 0;
    3.11  
     4.1 --- a/xen/arch/x86/domain.c	Thu Apr 27 09:56:21 2006 +0100
     4.2 +++ b/xen/arch/x86/domain.c	Thu Apr 27 13:38:21 2006 +0100
     4.3 @@ -364,7 +364,7 @@ int arch_set_info_guest(
     4.4  
     4.5  long
     4.6  arch_do_vcpu_op(
     4.7 -    int cmd, struct vcpu *v, GUEST_HANDLE(void) arg)
     4.8 +    int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg)
     4.9  {
    4.10      long rc = 0;
    4.11  
     5.1 --- a/xen/arch/x86/mm.c	Thu Apr 27 09:56:21 2006 +0100
     5.2 +++ b/xen/arch/x86/mm.c	Thu Apr 27 13:38:21 2006 +0100
     5.3 @@ -1757,9 +1757,9 @@ static inline cpumask_t vcpumask_to_pcpu
     5.4  }
     5.5  
     5.6  int do_mmuext_op(
     5.7 -    GUEST_HANDLE(mmuext_op_t) uops,
     5.8 +    XEN_GUEST_HANDLE(mmuext_op_t) uops,
     5.9      unsigned int count,
    5.10 -    GUEST_HANDLE(uint) pdone,
    5.11 +    XEN_GUEST_HANDLE(uint) pdone,
    5.12      unsigned int foreigndom)
    5.13  {
    5.14      struct mmuext_op op;
    5.15 @@ -2007,9 +2007,9 @@ int do_mmuext_op(
    5.16  }
    5.17  
    5.18  int do_mmu_update(
    5.19 -    GUEST_HANDLE(mmu_update_t) ureqs,
    5.20 +    XEN_GUEST_HANDLE(mmu_update_t) ureqs,
    5.21      unsigned int count,
    5.22 -    GUEST_HANDLE(uint) pdone,
    5.23 +    XEN_GUEST_HANDLE(uint) pdone,
    5.24      unsigned int foreigndom)
    5.25  {
    5.26      struct mmu_update req;
    5.27 @@ -2708,7 +2708,7 @@ long set_gdt(struct vcpu *v,
    5.28  }
    5.29  
    5.30  
    5.31 -long do_set_gdt(GUEST_HANDLE(ulong) frame_list, unsigned int entries)
    5.32 +long do_set_gdt(XEN_GUEST_HANDLE(ulong) frame_list, unsigned int entries)
    5.33  {
    5.34      int nr_pages = (entries + 511) / 512;
    5.35      unsigned long frames[16];
    5.36 @@ -2812,7 +2812,7 @@ long do_update_descriptor(u64 pa, u64 de
    5.37  }
    5.38  
    5.39  
    5.40 -long arch_memory_op(int op, GUEST_HANDLE(void) arg)
    5.41 +long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
    5.42  {
    5.43      switch ( op )
    5.44      {
     6.1 --- a/xen/arch/x86/oprofile/xenoprof.c	Thu Apr 27 09:56:21 2006 +0100
     6.2 +++ b/xen/arch/x86/oprofile/xenoprof.c	Thu Apr 27 13:38:21 2006 +0100
     6.3 @@ -349,7 +349,7 @@ void free_xenoprof_pages(struct domain *
     6.4      d->xenoprof = NULL;
     6.5  }
     6.6  
     6.7 -int xenoprof_op_init(GUEST_HANDLE(void) arg)
     6.8 +int xenoprof_op_init(XEN_GUEST_HANDLE(void) arg)
     6.9  {
    6.10      struct xenoprof_init xenoprof_init;
    6.11      int is_primary, num_events;
    6.12 @@ -410,7 +410,7 @@ int xenoprof_op_init(GUEST_HANDLE(void) 
    6.13                     || (op == XENOPROF_release_counters) \
    6.14                     || (op == XENOPROF_shutdown))
    6.15  
    6.16 -int do_xenoprof_op(int op, GUEST_HANDLE(void) arg)
    6.17 +int do_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg)
    6.18  {
    6.19      int ret = 0;
    6.20  
     7.1 --- a/xen/arch/x86/physdev.c	Thu Apr 27 09:56:21 2006 +0100
     7.2 +++ b/xen/arch/x86/physdev.c	Thu Apr 27 13:38:21 2006 +0100
     7.3 @@ -25,7 +25,7 @@ pirq_acktype(
     7.4  /*
     7.5   * Demuxing hypercall.
     7.6   */
     7.7 -long do_physdev_op(GUEST_HANDLE(physdev_op_t) uop)
     7.8 +long do_physdev_op(XEN_GUEST_HANDLE(physdev_op_t) uop)
     7.9  {
    7.10      struct physdev_op op;
    7.11      long ret;
     8.1 --- a/xen/arch/x86/traps.c	Thu Apr 27 09:56:21 2006 +0100
     8.2 +++ b/xen/arch/x86/traps.c	Thu Apr 27 13:38:21 2006 +0100
     8.3 @@ -1535,7 +1535,7 @@ void __init trap_init(void)
     8.4  }
     8.5  
     8.6  
     8.7 -long do_set_trap_table(GUEST_HANDLE(trap_info_t) traps)
     8.8 +long do_set_trap_table(XEN_GUEST_HANDLE(trap_info_t) traps)
     8.9  {
    8.10      struct trap_info cur;
    8.11      struct trap_info *dst = current->arch.guest_context.trap_ctxt;
     9.1 --- a/xen/arch/x86/x86_32/mm.c	Thu Apr 27 09:56:21 2006 +0100
     9.2 +++ b/xen/arch/x86/x86_32/mm.c	Thu Apr 27 13:38:21 2006 +0100
     9.3 @@ -189,7 +189,7 @@ void subarch_init_memory(void)
     9.4      }
     9.5  }
     9.6  
     9.7 -long subarch_memory_op(int op, GUEST_HANDLE(void) arg)
     9.8 +long subarch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
     9.9  {
    9.10      struct xen_machphys_mfn_list xmml;
    9.11      unsigned long mfn;
    10.1 --- a/xen/arch/x86/x86_32/traps.c	Thu Apr 27 09:56:21 2006 +0100
    10.2 +++ b/xen/arch/x86/x86_32/traps.c	Thu Apr 27 13:38:21 2006 +0100
    10.3 @@ -387,7 +387,7 @@ static long unregister_guest_callback(st
    10.4  }
    10.5  
    10.6  
    10.7 -long do_callback_op(int cmd, GUEST_HANDLE(void) arg)
    10.8 +long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg)
    10.9  {
   10.10      long ret;
   10.11  
    11.1 --- a/xen/arch/x86/x86_64/mm.c	Thu Apr 27 09:56:21 2006 +0100
    11.2 +++ b/xen/arch/x86/x86_64/mm.c	Thu Apr 27 13:38:21 2006 +0100
    11.3 @@ -181,7 +181,7 @@ void subarch_init_memory(void)
    11.4      }
    11.5  }
    11.6  
    11.7 -long subarch_memory_op(int op, GUEST_HANDLE(void) arg)
    11.8 +long subarch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
    11.9  {
   11.10      struct xen_machphys_mfn_list xmml;
   11.11      l3_pgentry_t l3e;
    12.1 --- a/xen/arch/x86/x86_64/traps.c	Thu Apr 27 09:56:21 2006 +0100
    12.2 +++ b/xen/arch/x86/x86_64/traps.c	Thu Apr 27 13:38:21 2006 +0100
    12.3 @@ -371,7 +371,7 @@ static long unregister_guest_callback(st
    12.4  }
    12.5  
    12.6  
    12.7 -long do_callback_op(int cmd, GUEST_HANDLE(void) arg)
    12.8 +long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg)
    12.9  {
   12.10      long ret;
   12.11  
    13.1 --- a/xen/common/acm_ops.c	Thu Apr 27 09:56:21 2006 +0100
    13.2 +++ b/xen/common/acm_ops.c	Thu Apr 27 13:38:21 2006 +0100
    13.3 @@ -32,7 +32,7 @@
    13.4  
    13.5  #ifndef ACM_SECURITY
    13.6  
    13.7 -long do_acm_op(GUEST_HANDLE(acm_op_t) u_acm_op)
    13.8 +long do_acm_op(XEN_GUEST_HANDLE(acm_op_t) u_acm_op)
    13.9  {
   13.10      return -ENOSYS;
   13.11  }
   13.12 @@ -57,7 +57,7 @@ int acm_authorize_acm_ops(struct domain 
   13.13      return 0;
   13.14  }
   13.15  
   13.16 -long do_acm_op(GUEST_HANDLE(acm_op_t) u_acm_op)
   13.17 +long do_acm_op(XEN_GUEST_HANDLE(acm_op_t) u_acm_op)
   13.18  {
   13.19      long ret = 0;
   13.20      struct acm_op curop, *op = &curop;
    14.1 --- a/xen/common/dom0_ops.c	Thu Apr 27 09:56:21 2006 +0100
    14.2 +++ b/xen/common/dom0_ops.c	Thu Apr 27 13:38:21 2006 +0100
    14.3 @@ -24,7 +24,7 @@
    14.4  #include <acm/acm_hooks.h>
    14.5  
    14.6  extern long arch_do_dom0_op(
    14.7 -    struct dom0_op *op, GUEST_HANDLE(dom0_op_t) u_dom0_op);
    14.8 +    struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op);
    14.9  extern void arch_getdomaininfo_ctxt(
   14.10      struct vcpu *, struct vcpu_guest_context *);
   14.11  
   14.12 @@ -90,7 +90,7 @@ static void getdomaininfo(struct domain 
   14.13      memcpy(info->handle, d->handle, sizeof(xen_domain_handle_t));
   14.14  }
   14.15  
   14.16 -long do_dom0_op(GUEST_HANDLE(dom0_op_t) u_dom0_op)
   14.17 +long do_dom0_op(XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
   14.18  {
   14.19      long ret = 0;
   14.20      struct dom0_op curop, *op = &curop;
    15.1 --- a/xen/common/domain.c	Thu Apr 27 09:56:21 2006 +0100
    15.2 +++ b/xen/common/domain.c	Thu Apr 27 13:38:21 2006 +0100
    15.3 @@ -408,7 +408,7 @@ int boot_vcpu(struct domain *d, int vcpu
    15.4      return arch_set_info_guest(v, ctxt);
    15.5  }
    15.6  
    15.7 -long do_vcpu_op(int cmd, int vcpuid, GUEST_HANDLE(void) arg)
    15.8 +long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg)
    15.9  {
   15.10      struct domain *d = current->domain;
   15.11      struct vcpu *v;
    16.1 --- a/xen/common/event_channel.c	Thu Apr 27 09:56:21 2006 +0100
    16.2 +++ b/xen/common/event_channel.c	Thu Apr 27 13:38:21 2006 +0100
    16.3 @@ -683,7 +683,7 @@ static long evtchn_unmask(evtchn_unmask_
    16.4  }
    16.5  
    16.6  
    16.7 -long do_event_channel_op(GUEST_HANDLE(evtchn_op_t) uop)
    16.8 +long do_event_channel_op(XEN_GUEST_HANDLE(evtchn_op_t) uop)
    16.9  {
   16.10      long rc;
   16.11      struct evtchn_op op;
    17.1 --- a/xen/common/grant_table.c	Thu Apr 27 09:56:21 2006 +0100
    17.2 +++ b/xen/common/grant_table.c	Thu Apr 27 13:38:21 2006 +0100
    17.3 @@ -301,7 +301,7 @@ static void
    17.4  
    17.5  static long
    17.6  gnttab_map_grant_ref(
    17.7 -    GUEST_HANDLE(gnttab_map_grant_ref_t) uop, unsigned int count)
    17.8 +    XEN_GUEST_HANDLE(gnttab_map_grant_ref_t) uop, unsigned int count)
    17.9  {
   17.10      int i;
   17.11      struct gnttab_map_grant_ref op;
   17.12 @@ -438,7 +438,7 @@ static void
   17.13  
   17.14  static long
   17.15  gnttab_unmap_grant_ref(
   17.16 -    GUEST_HANDLE(gnttab_unmap_grant_ref_t) uop, unsigned int count)
   17.17 +    XEN_GUEST_HANDLE(gnttab_unmap_grant_ref_t) uop, unsigned int count)
   17.18  {
   17.19      int i;
   17.20      struct gnttab_unmap_grant_ref op;
   17.21 @@ -462,7 +462,7 @@ fault:
   17.22  
   17.23  static long 
   17.24  gnttab_setup_table(
   17.25 -    GUEST_HANDLE(gnttab_setup_table_t) uop, unsigned int count)
   17.26 +    XEN_GUEST_HANDLE(gnttab_setup_table_t) uop, unsigned int count)
   17.27  {
   17.28      struct gnttab_setup_table op;
   17.29      struct domain *d;
   17.30 @@ -598,7 +598,7 @@ gnttab_prepare_for_transfer(
   17.31  
   17.32  static long
   17.33  gnttab_transfer(
   17.34 -    GUEST_HANDLE(gnttab_transfer_t) uop, unsigned int count)
   17.35 +    XEN_GUEST_HANDLE(gnttab_transfer_t) uop, unsigned int count)
   17.36  {
   17.37      struct domain *d = current->domain;
   17.38      struct domain *e;
   17.39 @@ -711,7 +711,7 @@ gnttab_transfer(
   17.40  
   17.41  long
   17.42  do_grant_table_op(
   17.43 -    unsigned int cmd, GUEST_HANDLE(void) uop, unsigned int count)
   17.44 +    unsigned int cmd, XEN_GUEST_HANDLE(void) uop, unsigned int count)
   17.45  {
   17.46      long rc;
   17.47      struct domain *d = current->domain;
   17.48 @@ -728,7 +728,7 @@ do_grant_table_op(
   17.49      {
   17.50      case GNTTABOP_map_grant_ref:
   17.51      {
   17.52 -        GUEST_HANDLE(gnttab_map_grant_ref_t) map =
   17.53 +        XEN_GUEST_HANDLE(gnttab_map_grant_ref_t) map =
   17.54              guest_handle_cast(uop, gnttab_map_grant_ref_t);
   17.55          if ( unlikely(!guest_handle_okay(map, count)) )
   17.56              goto out;
   17.57 @@ -737,7 +737,7 @@ do_grant_table_op(
   17.58      }
   17.59      case GNTTABOP_unmap_grant_ref:
   17.60      {
   17.61 -        GUEST_HANDLE(gnttab_unmap_grant_ref_t) unmap =
   17.62 +        XEN_GUEST_HANDLE(gnttab_unmap_grant_ref_t) unmap =
   17.63              guest_handle_cast(uop, gnttab_unmap_grant_ref_t);
   17.64          if ( unlikely(!guest_handle_okay(unmap, count)) )
   17.65              goto out;
   17.66 @@ -752,7 +752,7 @@ do_grant_table_op(
   17.67      }
   17.68      case GNTTABOP_transfer:
   17.69      {
   17.70 -        GUEST_HANDLE(gnttab_transfer_t) transfer =
   17.71 +        XEN_GUEST_HANDLE(gnttab_transfer_t) transfer =
   17.72              guest_handle_cast(uop, gnttab_transfer_t);
   17.73          if ( unlikely(!guest_handle_okay(transfer, count)) )
   17.74              goto out;
    18.1 --- a/xen/common/kernel.c	Thu Apr 27 09:56:21 2006 +0100
    18.2 +++ b/xen/common/kernel.c	Thu Apr 27 13:38:21 2006 +0100
    18.3 @@ -118,7 +118,7 @@ void add_taint(unsigned flag)
    18.4   * Simple hypercalls.
    18.5   */
    18.6  
    18.7 -long do_xen_version(int cmd, GUEST_HANDLE(void) arg)
    18.8 +long do_xen_version(int cmd, XEN_GUEST_HANDLE(void) arg)
    18.9  {
   18.10      switch ( cmd )
   18.11      {
   18.12 @@ -244,7 +244,7 @@ long unregister_guest_nmi_callback(void)
   18.13      return 0;
   18.14  }
   18.15  
   18.16 -long do_nmi_op(unsigned int cmd, GUEST_HANDLE(void) arg)
   18.17 +long do_nmi_op(unsigned int cmd, XEN_GUEST_HANDLE(void) arg)
   18.18  {
   18.19      struct xennmi_callback cb;
   18.20      long rc = 0;
    19.1 --- a/xen/common/memory.c	Thu Apr 27 09:56:21 2006 +0100
    19.2 +++ b/xen/common/memory.c	Thu Apr 27 13:38:21 2006 +0100
    19.3 @@ -31,7 +31,7 @@
    19.4  static long
    19.5  increase_reservation(
    19.6      struct domain *d, 
    19.7 -    GUEST_HANDLE(ulong) extent_list,
    19.8 +    XEN_GUEST_HANDLE(ulong) extent_list,
    19.9      unsigned int   nr_extents,
   19.10      unsigned int   extent_order,
   19.11      unsigned int   flags,
   19.12 @@ -80,7 +80,7 @@ increase_reservation(
   19.13  static long
   19.14  populate_physmap(
   19.15      struct domain *d, 
   19.16 -    GUEST_HANDLE(ulong) extent_list,
   19.17 +    XEN_GUEST_HANDLE(ulong) extent_list,
   19.18      unsigned int  nr_extents,
   19.19      unsigned int  extent_order,
   19.20      unsigned int  flags,
   19.21 @@ -177,7 +177,7 @@ guest_remove_page(
   19.22  static long
   19.23  decrease_reservation(
   19.24      struct domain *d,
   19.25 -    GUEST_HANDLE(ulong) extent_list,
   19.26 +    XEN_GUEST_HANDLE(ulong) extent_list,
   19.27      unsigned int   nr_extents,
   19.28      unsigned int   extent_order,
   19.29      unsigned int   flags,
   19.30 @@ -211,7 +211,7 @@ decrease_reservation(
   19.31  
   19.32  static long
   19.33  translate_gpfn_list(
   19.34 -    GUEST_HANDLE(xen_translate_gpfn_list_t) uop, unsigned long *progress)
   19.35 +    XEN_GUEST_HANDLE(xen_translate_gpfn_list_t) uop, unsigned long *progress)
   19.36  {
   19.37      struct xen_translate_gpfn_list op;
   19.38      unsigned long i, gpfn, mfn;
   19.39 @@ -270,7 +270,7 @@ translate_gpfn_list(
   19.40      return 0;
   19.41  }
   19.42  
   19.43 -long do_memory_op(unsigned long cmd, GUEST_HANDLE(void) arg)
   19.44 +long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg)
   19.45  {
   19.46      struct domain *d;
   19.47      int rc, op, flags = 0, preempted = 0;
    20.1 --- a/xen/common/multicall.c	Thu Apr 27 09:56:21 2006 +0100
    20.2 +++ b/xen/common/multicall.c	Thu Apr 27 13:38:21 2006 +0100
    20.3 @@ -18,7 +18,7 @@ struct mc_state mc_state[NR_CPUS];
    20.4  
    20.5  long
    20.6  do_multicall(
    20.7 -    GUEST_HANDLE(multicall_entry_t) call_list, unsigned int nr_calls)
    20.8 +    XEN_GUEST_HANDLE(multicall_entry_t) call_list, unsigned int nr_calls)
    20.9  {
   20.10      struct mc_state *mcs = &mc_state[smp_processor_id()];
   20.11      unsigned int     i;
    21.1 --- a/xen/common/perfc.c	Thu Apr 27 09:56:21 2006 +0100
    21.2 +++ b/xen/common/perfc.c	Thu Apr 27 13:38:21 2006 +0100
    21.3 @@ -131,7 +131,7 @@ void perfc_reset(unsigned char key)
    21.4  
    21.5  static dom0_perfc_desc_t perfc_d[NR_PERFCTRS];
    21.6  static int               perfc_init = 0;
    21.7 -static int perfc_copy_info(GUEST_HANDLE(dom0_perfc_desc_t) desc)
    21.8 +static int perfc_copy_info(XEN_GUEST_HANDLE(dom0_perfc_desc_t) desc)
    21.9  {
   21.10      unsigned int i, j;
   21.11      atomic_t *counters = (atomic_t *)&perfcounters;
    22.1 --- a/xen/common/schedule.c	Thu Apr 27 09:56:21 2006 +0100
    22.2 +++ b/xen/common/schedule.c	Thu Apr 27 13:38:21 2006 +0100
    22.3 @@ -365,7 +365,7 @@ long do_sched_op_compat(int cmd, unsigne
    22.4      return ret;
    22.5  }
    22.6  
    22.7 -long do_sched_op(int cmd, GUEST_HANDLE(void) arg)
    22.8 +long do_sched_op(int cmd, XEN_GUEST_HANDLE(void) arg)
    22.9  {
   22.10      long ret = 0;
   22.11  
    23.1 --- a/xen/drivers/char/console.c	Thu Apr 27 09:56:21 2006 +0100
    23.2 +++ b/xen/drivers/char/console.c	Thu Apr 27 13:38:21 2006 +0100
    23.3 @@ -221,7 +221,7 @@ static void putchar_console_ring(int c)
    23.4          conringc = conringp - CONRING_SIZE;
    23.5  }
    23.6  
    23.7 -long read_console_ring(GUEST_HANDLE(char) str, u32 *pcount, int clear)
    23.8 +long read_console_ring(XEN_GUEST_HANDLE(char) str, u32 *pcount, int clear)
    23.9  {
   23.10      unsigned int idx, len, max, sofar, c;
   23.11      unsigned long flags;
   23.12 @@ -319,7 +319,7 @@ static void serial_rx(char c, struct cpu
   23.13      __serial_rx(c, regs);
   23.14  }
   23.15  
   23.16 -static long guest_console_write(GUEST_HANDLE(char) buffer, int count)
   23.17 +static long guest_console_write(XEN_GUEST_HANDLE(char) buffer, int count)
   23.18  {
   23.19      char kbuf[128], *kptr;
   23.20      int kcount;
   23.21 @@ -355,7 +355,7 @@ static long guest_console_write(GUEST_HA
   23.22      return 0;
   23.23  }
   23.24  
   23.25 -long do_console_io(int cmd, int count, GUEST_HANDLE(char) buffer)
   23.26 +long do_console_io(int cmd, int count, XEN_GUEST_HANDLE(char) buffer)
   23.27  {
   23.28      long rc;
   23.29      unsigned int idx, len;
    24.1 --- a/xen/include/asm-ia64/guest_access.h	Thu Apr 27 09:56:21 2006 +0100
    24.2 +++ b/xen/include/asm-ia64/guest_access.h	Thu Apr 27 13:38:21 2006 +0100
    24.3 @@ -18,10 +18,10 @@
    24.4  /* Cast a guest handle to the specified type of handle. */
    24.5  #define guest_handle_cast(hnd, type) ({         \
    24.6      type *_x = (hnd).p;                         \
    24.7 -    (GUEST_HANDLE(type)) { _x };                \
    24.8 +    (XEN_GUEST_HANDLE(type)) { _x };                \
    24.9  })
   24.10  
   24.11 -#define guest_handle_from_ptr(ptr, type) ((GUEST_HANDLE(type)) { (type *)ptr })
   24.12 +#define guest_handle_from_ptr(ptr, type) ((XEN_GUEST_HANDLE(type)) { (type *)ptr })
   24.13  
   24.14  /*
   24.15   * Copy an array of objects to guest context via a guest handle,
    25.1 --- a/xen/include/asm-x86/guest_access.h	Thu Apr 27 09:56:21 2006 +0100
    25.2 +++ b/xen/include/asm-x86/guest_access.h	Thu Apr 27 13:38:21 2006 +0100
    25.3 @@ -18,7 +18,7 @@
    25.4  /* Cast a guest handle to the specified type of handle. */
    25.5  #define guest_handle_cast(hnd, type) ({         \
    25.6      type *_x = (hnd).p;                         \
    25.7 -    (GUEST_HANDLE(type)) { _x };                \
    25.8 +    (XEN_GUEST_HANDLE(type)) { _x };                \
    25.9  })
   25.10  
   25.11  /*
    26.1 --- a/xen/include/asm-x86/hypercall.h	Thu Apr 27 09:56:21 2006 +0100
    26.2 +++ b/xen/include/asm-x86/hypercall.h	Thu Apr 27 13:38:21 2006 +0100
    26.3 @@ -9,18 +9,18 @@
    26.4  
    26.5  extern long
    26.6  do_set_trap_table(
    26.7 -    GUEST_HANDLE(trap_info_t) traps);
    26.8 +    XEN_GUEST_HANDLE(trap_info_t) traps);
    26.9  
   26.10  extern int
   26.11  do_mmu_update(
   26.12 -    GUEST_HANDLE(mmu_update_t) ureqs,
   26.13 +    XEN_GUEST_HANDLE(mmu_update_t) ureqs,
   26.14      unsigned int count,
   26.15 -    GUEST_HANDLE(uint) pdone,
   26.16 +    XEN_GUEST_HANDLE(uint) pdone,
   26.17      unsigned int foreigndom);
   26.18  
   26.19  extern long
   26.20  do_set_gdt(
   26.21 -    GUEST_HANDLE(ulong) frame_list,
   26.22 +    XEN_GUEST_HANDLE(ulong) frame_list,
   26.23      unsigned int entries);
   26.24  
   26.25  extern long
   26.26 @@ -54,7 +54,7 @@ do_update_va_mapping(
   26.27  
   26.28  extern long
   26.29  do_physdev_op(
   26.30 -    GUEST_HANDLE(physdev_op_t) uop);
   26.31 +    XEN_GUEST_HANDLE(physdev_op_t) uop);
   26.32  
   26.33  extern int
   26.34  do_update_va_mapping_otherdomain(
   26.35 @@ -65,9 +65,9 @@ do_update_va_mapping_otherdomain(
   26.36  
   26.37  extern int
   26.38  do_mmuext_op(
   26.39 -    GUEST_HANDLE(mmuext_op_t) uops,
   26.40 +    XEN_GUEST_HANDLE(mmuext_op_t) uops,
   26.41      unsigned int count,
   26.42 -    GUEST_HANDLE(uint) pdone,
   26.43 +    XEN_GUEST_HANDLE(uint) pdone,
   26.44      unsigned int foreigndom);
   26.45  
   26.46  extern unsigned long
   26.47 @@ -77,7 +77,7 @@ do_iret(
   26.48  struct vcpu;
   26.49  extern long
   26.50  arch_do_vcpu_op(
   26.51 -    int cmd, struct vcpu *v, GUEST_HANDLE(void) arg);
   26.52 +    int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg);
   26.53  
   26.54  #ifdef __x86_64__
   26.55  
    27.1 --- a/xen/include/asm-x86/mm.h	Thu Apr 27 09:56:21 2006 +0100
    27.2 +++ b/xen/include/asm-x86/mm.h	Thu Apr 27 13:38:21 2006 +0100
    27.3 @@ -382,7 +382,7 @@ void propagate_page_fault(unsigned long 
    27.4  int __sync_lazy_execstate(void);
    27.5  
    27.6  /* Arch-specific portion of memory_op hypercall. */
    27.7 -long arch_memory_op(int op, GUEST_HANDLE(void) arg);
    27.8 -long subarch_memory_op(int op, GUEST_HANDLE(void) arg);
    27.9 +long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg);
   27.10 +long subarch_memory_op(int op, XEN_GUEST_HANDLE(void) arg);
   27.11  
   27.12  #endif /* __ASM_X86_MM_H__ */
    28.1 --- a/xen/include/public/acm_ops.h	Thu Apr 27 09:56:21 2006 +0100
    28.2 +++ b/xen/include/public/acm_ops.h	Thu Apr 27 13:38:21 2006 +0100
    28.3 @@ -83,7 +83,7 @@ typedef struct acm_op {
    28.4          struct acm_getdecision getdecision;
    28.5      } u;
    28.6  } acm_op_t;
    28.7 -DEFINE_GUEST_HANDLE(acm_op_t);
    28.8 +DEFINE_XEN_GUEST_HANDLE(acm_op_t);
    28.9  
   28.10  #endif                          /* __XEN_PUBLIC_ACM_OPS_H__ */
   28.11  
    29.1 --- a/xen/include/public/arch-ia64.h	Thu Apr 27 09:56:21 2006 +0100
    29.2 +++ b/xen/include/public/arch-ia64.h	Thu Apr 27 13:38:21 2006 +0100
    29.3 @@ -8,25 +8,25 @@
    29.4  #define __HYPERVISOR_IF_IA64_H__
    29.5  
    29.6  #ifdef __XEN__
    29.7 -#define __DEFINE_GUEST_HANDLE(name, type) \
    29.8 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
    29.9      typedef struct { type *p; } __guest_handle_ ## name
   29.10  #else
   29.11 -#define __DEFINE_GUEST_HANDLE(name, type) \
   29.12 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
   29.13      typedef type * __guest_handle_ ## name
   29.14  #endif
   29.15  
   29.16 -#define DEFINE_GUEST_HANDLE(name) __DEFINE_GUEST_HANDLE(name, name)
   29.17 -#define GUEST_HANDLE(name)        __guest_handle_ ## name
   29.18 +#define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name)
   29.19 +#define XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
   29.20  
   29.21  #ifndef __ASSEMBLY__
   29.22  /* Guest handles for primitive C types. */
   29.23 -__DEFINE_GUEST_HANDLE(uchar, unsigned char);
   29.24 -__DEFINE_GUEST_HANDLE(uint,  unsigned int);
   29.25 -__DEFINE_GUEST_HANDLE(ulong, unsigned long);
   29.26 -DEFINE_GUEST_HANDLE(char);
   29.27 -DEFINE_GUEST_HANDLE(int);
   29.28 -DEFINE_GUEST_HANDLE(long);
   29.29 -DEFINE_GUEST_HANDLE(void);
   29.30 +__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
   29.31 +__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
   29.32 +__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
   29.33 +DEFINE_XEN_GUEST_HANDLE(char);
   29.34 +DEFINE_XEN_GUEST_HANDLE(int);
   29.35 +DEFINE_XEN_GUEST_HANDLE(long);
   29.36 +DEFINE_XEN_GUEST_HANDLE(void);
   29.37  #endif
   29.38  
   29.39  /* Maximum number of virtual CPUs in multi-processor guests. */
   29.40 @@ -324,7 +324,7 @@ typedef struct vcpu_guest_context {
   29.41      arch_initrd_info_t initrd;
   29.42      char cmdline[IA64_COMMAND_LINE_SIZE];
   29.43  } vcpu_guest_context_t;
   29.44 -DEFINE_GUEST_HANDLE(vcpu_guest_context_t);
   29.45 +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
   29.46  
   29.47  // dom0 vp op
   29.48  #define __HYPERVISOR_ia64_dom0vp_op     256 // XXX sufficient large
    30.1 --- a/xen/include/public/arch-x86_32.h	Thu Apr 27 09:56:21 2006 +0100
    30.2 +++ b/xen/include/public/arch-x86_32.h	Thu Apr 27 13:38:21 2006 +0100
    30.3 @@ -10,25 +10,25 @@
    30.4  #define __XEN_PUBLIC_ARCH_X86_32_H__
    30.5  
    30.6  #ifdef __XEN__
    30.7 -#define __DEFINE_GUEST_HANDLE(name, type) \
    30.8 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
    30.9      typedef struct { type *p; } __guest_handle_ ## name
   30.10  #else
   30.11 -#define __DEFINE_GUEST_HANDLE(name, type) \
   30.12 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
   30.13      typedef type * __guest_handle_ ## name
   30.14  #endif
   30.15  
   30.16 -#define DEFINE_GUEST_HANDLE(name) __DEFINE_GUEST_HANDLE(name, name)
   30.17 -#define GUEST_HANDLE(name)        __guest_handle_ ## name
   30.18 +#define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name)
   30.19 +#define XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
   30.20  
   30.21  #ifndef __ASSEMBLY__
   30.22  /* Guest handles for primitive C types. */
   30.23 -__DEFINE_GUEST_HANDLE(uchar, unsigned char);
   30.24 -__DEFINE_GUEST_HANDLE(uint,  unsigned int);
   30.25 -__DEFINE_GUEST_HANDLE(ulong, unsigned long);
   30.26 -DEFINE_GUEST_HANDLE(char);
   30.27 -DEFINE_GUEST_HANDLE(int);
   30.28 -DEFINE_GUEST_HANDLE(long);
   30.29 -DEFINE_GUEST_HANDLE(void);
   30.30 +__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
   30.31 +__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
   30.32 +__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
   30.33 +DEFINE_XEN_GUEST_HANDLE(char);
   30.34 +DEFINE_XEN_GUEST_HANDLE(int);
   30.35 +DEFINE_XEN_GUEST_HANDLE(long);
   30.36 +DEFINE_XEN_GUEST_HANDLE(void);
   30.37  #endif
   30.38  
   30.39  /*
   30.40 @@ -102,7 +102,7 @@ typedef struct trap_info {
   30.41      uint16_t      cs;      /* code selector                                 */
   30.42      unsigned long address; /* code offset                                   */
   30.43  } trap_info_t;
   30.44 -DEFINE_GUEST_HANDLE(trap_info_t);
   30.45 +DEFINE_XEN_GUEST_HANDLE(trap_info_t);
   30.46  
   30.47  typedef struct cpu_user_regs {
   30.48      uint32_t ebx;
   30.49 @@ -126,7 +126,7 @@ typedef struct cpu_user_regs {
   30.50      uint16_t fs, _pad4;
   30.51      uint16_t gs, _pad5;
   30.52  } cpu_user_regs_t;
   30.53 -DEFINE_GUEST_HANDLE(cpu_user_regs_t);
   30.54 +DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t);
   30.55  
   30.56  typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */
   30.57  
   30.58 @@ -154,7 +154,7 @@ typedef struct vcpu_guest_context {
   30.59      unsigned long failsafe_callback_eip;
   30.60      unsigned long vm_assist;                /* VMASST_TYPE_* bitmap */
   30.61  } vcpu_guest_context_t;
   30.62 -DEFINE_GUEST_HANDLE(vcpu_guest_context_t);
   30.63 +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
   30.64  
   30.65  typedef struct arch_shared_info {
   30.66      unsigned long max_pfn;                  /* max pfn that appears in table */
    31.1 --- a/xen/include/public/arch-x86_64.h	Thu Apr 27 09:56:21 2006 +0100
    31.2 +++ b/xen/include/public/arch-x86_64.h	Thu Apr 27 13:38:21 2006 +0100
    31.3 @@ -10,25 +10,25 @@
    31.4  #define __XEN_PUBLIC_ARCH_X86_64_H__
    31.5  
    31.6  #ifdef __XEN__
    31.7 -#define __DEFINE_GUEST_HANDLE(name, type) \
    31.8 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
    31.9      typedef struct { type *p; } __guest_handle_ ## name
   31.10  #else
   31.11 -#define __DEFINE_GUEST_HANDLE(name, type) \
   31.12 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
   31.13      typedef type * __guest_handle_ ## name
   31.14  #endif
   31.15  
   31.16 -#define DEFINE_GUEST_HANDLE(name) __DEFINE_GUEST_HANDLE(name, name)
   31.17 -#define GUEST_HANDLE(name)        __guest_handle_ ## name
   31.18 +#define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name)
   31.19 +#define XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
   31.20  
   31.21  #ifndef __ASSEMBLY__
   31.22  /* Guest handles for primitive C types. */
   31.23 -__DEFINE_GUEST_HANDLE(uchar, unsigned char);
   31.24 -__DEFINE_GUEST_HANDLE(uint,  unsigned int);
   31.25 -__DEFINE_GUEST_HANDLE(ulong, unsigned long);
   31.26 -DEFINE_GUEST_HANDLE(char);
   31.27 -DEFINE_GUEST_HANDLE(int);
   31.28 -DEFINE_GUEST_HANDLE(long);
   31.29 -DEFINE_GUEST_HANDLE(void);
   31.30 +__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
   31.31 +__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
   31.32 +__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
   31.33 +DEFINE_XEN_GUEST_HANDLE(char);
   31.34 +DEFINE_XEN_GUEST_HANDLE(int);
   31.35 +DEFINE_XEN_GUEST_HANDLE(long);
   31.36 +DEFINE_XEN_GUEST_HANDLE(void);
   31.37  #endif
   31.38  
   31.39  /*
   31.40 @@ -157,7 +157,7 @@ typedef struct trap_info {
   31.41      uint16_t      cs;      /* code selector                                 */
   31.42      unsigned long address; /* code offset                                   */
   31.43  } trap_info_t;
   31.44 -DEFINE_GUEST_HANDLE(trap_info_t);
   31.45 +DEFINE_XEN_GUEST_HANDLE(trap_info_t);
   31.46  
   31.47  #ifdef __GNUC__
   31.48  /* Anonymous union includes both 32- and 64-bit names (e.g., eax/rax). */
   31.49 @@ -197,7 +197,7 @@ typedef struct cpu_user_regs {
   31.50      uint16_t fs, _pad5[3]; /* Non-zero => takes precedence over fs_base.     */
   31.51      uint16_t gs, _pad6[3]; /* Non-zero => takes precedence over gs_base_usr. */
   31.52  } cpu_user_regs_t;
   31.53 -DEFINE_GUEST_HANDLE(cpu_user_regs_t);
   31.54 +DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t);
   31.55  
   31.56  #undef __DECL_REG
   31.57  
   31.58 @@ -230,7 +230,7 @@ typedef struct vcpu_guest_context {
   31.59      uint64_t      gs_base_kernel;
   31.60      uint64_t      gs_base_user;
   31.61  } vcpu_guest_context_t;
   31.62 -DEFINE_GUEST_HANDLE(vcpu_guest_context_t);
   31.63 +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
   31.64  
   31.65  typedef struct arch_shared_info {
   31.66      unsigned long max_pfn;                  /* max pfn that appears in table */
    32.1 --- a/xen/include/public/callback.h	Thu Apr 27 09:56:21 2006 +0100
    32.2 +++ b/xen/include/public/callback.h	Thu Apr 27 13:38:21 2006 +0100
    32.3 @@ -36,7 +36,7 @@ typedef struct callback_register {
    32.4       int type;
    32.5       xen_callback_t address;
    32.6  } callback_register_t;
    32.7 -DEFINE_GUEST_HANDLE(callback_register_t);
    32.8 +DEFINE_XEN_GUEST_HANDLE(callback_register_t);
    32.9  
   32.10  /*
   32.11   * Unregister a callback.
   32.12 @@ -48,7 +48,7 @@ DEFINE_GUEST_HANDLE(callback_register_t)
   32.13  typedef struct callback_unregister {
   32.14       int type;
   32.15  } callback_unregister_t;
   32.16 -DEFINE_GUEST_HANDLE(callback_unregister_t);
   32.17 +DEFINE_XEN_GUEST_HANDLE(callback_unregister_t);
   32.18  
   32.19  #endif /* __XEN_PUBLIC_CALLBACK_H__ */
   32.20  
    33.1 --- a/xen/include/public/dom0_ops.h	Thu Apr 27 09:56:21 2006 +0100
    33.2 +++ b/xen/include/public/dom0_ops.h	Thu Apr 27 13:38:21 2006 +0100
    33.3 @@ -28,21 +28,21 @@ typedef struct dom0_getmemlist {
    33.4      /* IN variables. */
    33.5      domid_t       domain;
    33.6      unsigned long max_pfns;
    33.7 -    GUEST_HANDLE(ulong) buffer;
    33.8 +    XEN_GUEST_HANDLE(ulong) buffer;
    33.9      /* OUT variables. */
   33.10      unsigned long num_pfns;
   33.11  } dom0_getmemlist_t;
   33.12 -DEFINE_GUEST_HANDLE(dom0_getmemlist_t);
   33.13 +DEFINE_XEN_GUEST_HANDLE(dom0_getmemlist_t);
   33.14  
   33.15  #define DOM0_SCHEDCTL          6
   33.16   /* struct sched_ctl_cmd is from sched-ctl.h   */
   33.17  typedef struct sched_ctl_cmd dom0_schedctl_t;
   33.18 -DEFINE_GUEST_HANDLE(dom0_schedctl_t);
   33.19 +DEFINE_XEN_GUEST_HANDLE(dom0_schedctl_t);
   33.20  
   33.21  #define DOM0_ADJUSTDOM         7
   33.22  /* struct sched_adjdom_cmd is from sched-ctl.h */
   33.23  typedef struct sched_adjdom_cmd dom0_adjustdom_t;
   33.24 -DEFINE_GUEST_HANDLE(dom0_adjustdom_t);
   33.25 +DEFINE_XEN_GUEST_HANDLE(dom0_adjustdom_t);
   33.26  
   33.27  #define DOM0_CREATEDOMAIN      8
   33.28  typedef struct dom0_createdomain {
   33.29 @@ -53,28 +53,28 @@ typedef struct dom0_createdomain {
   33.30      /* Identifier for new domain (auto-allocate if zero is specified). */
   33.31      domid_t domain;
   33.32  } dom0_createdomain_t;
   33.33 -DEFINE_GUEST_HANDLE(dom0_createdomain_t);
   33.34 +DEFINE_XEN_GUEST_HANDLE(dom0_createdomain_t);
   33.35  
   33.36  #define DOM0_DESTROYDOMAIN     9
   33.37  typedef struct dom0_destroydomain {
   33.38      /* IN variables. */
   33.39      domid_t domain;
   33.40  } dom0_destroydomain_t;
   33.41 -DEFINE_GUEST_HANDLE(dom0_destroydomain_t);
   33.42 +DEFINE_XEN_GUEST_HANDLE(dom0_destroydomain_t);
   33.43  
   33.44  #define DOM0_PAUSEDOMAIN      10
   33.45  typedef struct dom0_pausedomain {
   33.46      /* IN parameters. */
   33.47      domid_t domain;
   33.48  } dom0_pausedomain_t;
   33.49 -DEFINE_GUEST_HANDLE(dom0_pausedomain_t);
   33.50 +DEFINE_XEN_GUEST_HANDLE(dom0_pausedomain_t);
   33.51  
   33.52  #define DOM0_UNPAUSEDOMAIN    11
   33.53  typedef struct dom0_unpausedomain {
   33.54      /* IN parameters. */
   33.55      domid_t domain;
   33.56  } dom0_unpausedomain_t;
   33.57 -DEFINE_GUEST_HANDLE(dom0_unpausedomain_t);
   33.58 +DEFINE_XEN_GUEST_HANDLE(dom0_unpausedomain_t);
   33.59  
   33.60  #define DOM0_GETDOMAININFO    12
   33.61  typedef struct dom0_getdomaininfo {
   33.62 @@ -100,7 +100,7 @@ typedef struct dom0_getdomaininfo {
   33.63      uint32_t ssidref;
   33.64      xen_domain_handle_t handle;
   33.65  } dom0_getdomaininfo_t;
   33.66 -DEFINE_GUEST_HANDLE(dom0_getdomaininfo_t);
   33.67 +DEFINE_XEN_GUEST_HANDLE(dom0_getdomaininfo_t);
   33.68  
   33.69  #define DOM0_SETVCPUCONTEXT   13
   33.70  typedef struct dom0_setvcpucontext {
   33.71 @@ -108,9 +108,9 @@ typedef struct dom0_setvcpucontext {
   33.72      domid_t               domain;
   33.73      uint32_t              vcpu;
   33.74      /* IN/OUT parameters */
   33.75 -    GUEST_HANDLE(vcpu_guest_context_t) ctxt;
   33.76 +    XEN_GUEST_HANDLE(vcpu_guest_context_t) ctxt;
   33.77  } dom0_setvcpucontext_t;
   33.78 -DEFINE_GUEST_HANDLE(dom0_setvcpucontext_t);
   33.79 +DEFINE_XEN_GUEST_HANDLE(dom0_setvcpucontext_t);
   33.80  
   33.81  #define DOM0_MSR              15
   33.82  typedef struct dom0_msr {
   33.83 @@ -124,7 +124,7 @@ typedef struct dom0_msr {
   33.84      uint32_t out1;
   33.85      uint32_t out2;
   33.86  } dom0_msr_t;
   33.87 -DEFINE_GUEST_HANDLE(dom0_msr_t);
   33.88 +DEFINE_XEN_GUEST_HANDLE(dom0_msr_t);
   33.89  
   33.90  /*
   33.91   * Set clock such that it would read <secs,nsecs> after 00:00:00 UTC,
   33.92 @@ -137,7 +137,7 @@ typedef struct dom0_settime {
   33.93      uint32_t nsecs;
   33.94      uint64_t system_time;
   33.95  } dom0_settime_t;
   33.96 -DEFINE_GUEST_HANDLE(dom0_settime_t);
   33.97 +DEFINE_XEN_GUEST_HANDLE(dom0_settime_t);
   33.98  
   33.99  #define DOM0_GETPAGEFRAMEINFO 18
  33.100  #define LTAB_SHIFT 28
  33.101 @@ -159,7 +159,7 @@ typedef struct dom0_getpageframeinfo {
  33.102      /* Is the page PINNED to a type? */
  33.103      uint32_t type;         /* see above type defs */
  33.104  } dom0_getpageframeinfo_t;
  33.105 -DEFINE_GUEST_HANDLE(dom0_getpageframeinfo_t);
  33.106 +DEFINE_XEN_GUEST_HANDLE(dom0_getpageframeinfo_t);
  33.107  
  33.108  /*
  33.109   * Read console content from Xen buffer ring.
  33.110 @@ -169,10 +169,10 @@ typedef struct dom0_readconsole {
  33.111      /* IN variables. */
  33.112      uint32_t clear;            /* Non-zero -> clear after reading. */
  33.113      /* IN/OUT variables. */
  33.114 -    GUEST_HANDLE(char) buffer; /* In: Buffer start; Out: Used buffer start */
  33.115 +    XEN_GUEST_HANDLE(char) buffer; /* In: Buffer start; Out: Used buffer start */
  33.116      uint32_t count;            /* In: Buffer size;  Out: Used buffer size  */
  33.117  } dom0_readconsole_t;
  33.118 -DEFINE_GUEST_HANDLE(dom0_readconsole_t);
  33.119 +DEFINE_XEN_GUEST_HANDLE(dom0_readconsole_t);
  33.120  
  33.121  /*
  33.122   * Set which physical cpus a vcpu can execute on.
  33.123 @@ -184,7 +184,7 @@ typedef struct dom0_setvcpuaffinity {
  33.124      uint32_t  vcpu;
  33.125      cpumap_t  cpumap;
  33.126  } dom0_setvcpuaffinity_t;
  33.127 -DEFINE_GUEST_HANDLE(dom0_setvcpuaffinity_t);
  33.128 +DEFINE_XEN_GUEST_HANDLE(dom0_setvcpuaffinity_t);
  33.129  
  33.130  /* Get trace buffers machine base address */
  33.131  #define DOM0_TBUFCONTROL       21
  33.132 @@ -204,7 +204,7 @@ typedef struct dom0_tbufcontrol {
  33.133      unsigned long buffer_mfn;
  33.134      uint32_t size;
  33.135  } dom0_tbufcontrol_t;
  33.136 -DEFINE_GUEST_HANDLE(dom0_tbufcontrol_t);
  33.137 +DEFINE_XEN_GUEST_HANDLE(dom0_tbufcontrol_t);
  33.138  
  33.139  /*
  33.140   * Get physical information about the host machine
  33.141 @@ -220,7 +220,7 @@ typedef struct dom0_physinfo {
  33.142      unsigned long free_pages;
  33.143      uint32_t hw_cap[8];
  33.144  } dom0_physinfo_t;
  33.145 -DEFINE_GUEST_HANDLE(dom0_physinfo_t);
  33.146 +DEFINE_XEN_GUEST_HANDLE(dom0_physinfo_t);
  33.147  
  33.148  /*
  33.149   * Get the ID of the current scheduler.
  33.150 @@ -230,7 +230,7 @@ typedef struct dom0_sched_id {
  33.151      /* OUT variable */
  33.152      uint32_t sched_id;
  33.153  } dom0_sched_id_t;
  33.154 -DEFINE_GUEST_HANDLE(dom0_sched_id_t);
  33.155 +DEFINE_XEN_GUEST_HANDLE(dom0_sched_id_t);
  33.156  
  33.157  /*
  33.158   * Control shadow pagetables operation
  33.159 @@ -252,19 +252,19 @@ typedef struct dom0_shadow_control_stats
  33.160      uint32_t dirty_net_count;
  33.161      uint32_t dirty_block_count;
  33.162  } dom0_shadow_control_stats_t;
  33.163 -DEFINE_GUEST_HANDLE(dom0_shadow_control_stats_t);
  33.164 +DEFINE_XEN_GUEST_HANDLE(dom0_shadow_control_stats_t);
  33.165  
  33.166  typedef struct dom0_shadow_control {
  33.167      /* IN variables. */
  33.168      domid_t        domain;
  33.169      uint32_t       op;
  33.170 -    GUEST_HANDLE(ulong) dirty_bitmap;
  33.171 +    XEN_GUEST_HANDLE(ulong) dirty_bitmap;
  33.172      /* IN/OUT variables. */
  33.173      unsigned long  pages;        /* size of buffer, updated with actual size */
  33.174      /* OUT variables. */
  33.175      dom0_shadow_control_stats_t stats;
  33.176  } dom0_shadow_control_t;
  33.177 -DEFINE_GUEST_HANDLE(dom0_shadow_control_t);
  33.178 +DEFINE_XEN_GUEST_HANDLE(dom0_shadow_control_t);
  33.179  
  33.180  #define DOM0_SETDOMAINMAXMEM   28
  33.181  typedef struct dom0_setdomainmaxmem {
  33.182 @@ -272,7 +272,7 @@ typedef struct dom0_setdomainmaxmem {
  33.183      domid_t       domain;
  33.184      unsigned long max_memkb;
  33.185  } dom0_setdomainmaxmem_t;
  33.186 -DEFINE_GUEST_HANDLE(dom0_setdomainmaxmem_t);
  33.187 +DEFINE_XEN_GUEST_HANDLE(dom0_setdomainmaxmem_t);
  33.188  
  33.189  #define DOM0_GETPAGEFRAMEINFO2 29   /* batched interface */
  33.190  typedef struct dom0_getpageframeinfo2 {
  33.191 @@ -280,9 +280,9 @@ typedef struct dom0_getpageframeinfo2 {
  33.192      domid_t        domain;
  33.193      unsigned long  num;
  33.194      /* IN/OUT variables. */
  33.195 -    GUEST_HANDLE(ulong) array;
  33.196 +    XEN_GUEST_HANDLE(ulong) array;
  33.197  } dom0_getpageframeinfo2_t;
  33.198 -DEFINE_GUEST_HANDLE(dom0_getpageframeinfo2_t);
  33.199 +DEFINE_XEN_GUEST_HANDLE(dom0_getpageframeinfo2_t);
  33.200  
  33.201  /*
  33.202   * Request memory range (@mfn, @mfn+@nr_mfns-1) to have type @type.
  33.203 @@ -301,7 +301,7 @@ typedef struct dom0_add_memtype {
  33.204      uint32_t      handle;
  33.205      uint32_t      reg;
  33.206  } dom0_add_memtype_t;
  33.207 -DEFINE_GUEST_HANDLE(dom0_add_memtype_t);
  33.208 +DEFINE_XEN_GUEST_HANDLE(dom0_add_memtype_t);
  33.209  
  33.210  /*
  33.211   * Tear down an existing memory-range type. If @handle is remembered then it
  33.212 @@ -316,7 +316,7 @@ typedef struct dom0_del_memtype {
  33.213      uint32_t handle;
  33.214      uint32_t reg;
  33.215  } dom0_del_memtype_t;
  33.216 -DEFINE_GUEST_HANDLE(dom0_del_memtype_t);
  33.217 +DEFINE_XEN_GUEST_HANDLE(dom0_del_memtype_t);
  33.218  
  33.219  /* Read current type of an MTRR (x86-specific). */
  33.220  #define DOM0_READ_MEMTYPE        33
  33.221 @@ -328,7 +328,7 @@ typedef struct dom0_read_memtype {
  33.222      unsigned long nr_mfns;
  33.223      uint32_t type;
  33.224  } dom0_read_memtype_t;
  33.225 -DEFINE_GUEST_HANDLE(dom0_read_memtype_t);
  33.226 +DEFINE_XEN_GUEST_HANDLE(dom0_read_memtype_t);
  33.227  
  33.228  /* Interface for controlling Xen software performance counters. */
  33.229  #define DOM0_PERFCCONTROL        34
  33.230 @@ -340,23 +340,23 @@ typedef struct dom0_perfc_desc {
  33.231      uint32_t     nr_vals;              /* number of values for this counter */
  33.232      uint32_t     vals[64];             /* array of values */
  33.233  } dom0_perfc_desc_t;
  33.234 -DEFINE_GUEST_HANDLE(dom0_perfc_desc_t);
  33.235 +DEFINE_XEN_GUEST_HANDLE(dom0_perfc_desc_t);
  33.236  typedef struct dom0_perfccontrol {
  33.237      /* IN variables. */
  33.238      uint32_t       op;                /*  DOM0_PERFCCONTROL_OP_??? */
  33.239      /* OUT variables. */
  33.240      uint32_t       nr_counters;       /*  number of counters */
  33.241 -    GUEST_HANDLE(dom0_perfc_desc_t) desc; /*  counter information (or NULL) */
  33.242 +    XEN_GUEST_HANDLE(dom0_perfc_desc_t) desc; /*  counter information (or NULL) */
  33.243  } dom0_perfccontrol_t;
  33.244 -DEFINE_GUEST_HANDLE(dom0_perfccontrol_t);
  33.245 +DEFINE_XEN_GUEST_HANDLE(dom0_perfccontrol_t);
  33.246  
  33.247  #define DOM0_MICROCODE           35
  33.248  typedef struct dom0_microcode {
  33.249      /* IN variables. */
  33.250 -    GUEST_HANDLE(void) data;          /* Pointer to microcode data */
  33.251 +    XEN_GUEST_HANDLE(void) data;          /* Pointer to microcode data */
  33.252      uint32_t length;                  /* Length of microcode data. */
  33.253  } dom0_microcode_t;
  33.254 -DEFINE_GUEST_HANDLE(dom0_microcode_t);
  33.255 +DEFINE_XEN_GUEST_HANDLE(dom0_microcode_t);
  33.256  
  33.257  #define DOM0_IOPORT_PERMISSION   36
  33.258  typedef struct dom0_ioport_permission {
  33.259 @@ -365,7 +365,7 @@ typedef struct dom0_ioport_permission {
  33.260      uint32_t nr_ports;                /* size of port range */
  33.261      uint8_t  allow_access;            /* allow or deny access to range? */
  33.262  } dom0_ioport_permission_t;
  33.263 -DEFINE_GUEST_HANDLE(dom0_ioport_permission_t);
  33.264 +DEFINE_XEN_GUEST_HANDLE(dom0_ioport_permission_t);
  33.265  
  33.266  #define DOM0_GETVCPUCONTEXT      37
  33.267  typedef struct dom0_getvcpucontext {
  33.268 @@ -373,9 +373,9 @@ typedef struct dom0_getvcpucontext {
  33.269      domid_t  domain;                  /* domain to be affected */
  33.270      uint32_t vcpu;                    /* vcpu # */
  33.271      /* OUT variables. */
  33.272 -    GUEST_HANDLE(vcpu_guest_context_t) ctxt;
  33.273 +    XEN_GUEST_HANDLE(vcpu_guest_context_t) ctxt;
  33.274  } dom0_getvcpucontext_t;
  33.275 -DEFINE_GUEST_HANDLE(dom0_getvcpucontext_t);
  33.276 +DEFINE_XEN_GUEST_HANDLE(dom0_getvcpucontext_t);
  33.277  
  33.278  #define DOM0_GETVCPUINFO         43
  33.279  typedef struct dom0_getvcpuinfo {
  33.280 @@ -390,18 +390,18 @@ typedef struct dom0_getvcpuinfo {
  33.281      uint32_t cpu;                     /* current mapping   */
  33.282      cpumap_t cpumap;                  /* allowable mapping */
  33.283  } dom0_getvcpuinfo_t;
  33.284 -DEFINE_GUEST_HANDLE(dom0_getvcpuinfo_t);
  33.285 +DEFINE_XEN_GUEST_HANDLE(dom0_getvcpuinfo_t);
  33.286  
  33.287  #define DOM0_GETDOMAININFOLIST   38
  33.288  typedef struct dom0_getdomaininfolist {
  33.289      /* IN variables. */
  33.290      domid_t               first_domain;
  33.291      uint32_t              max_domains;
  33.292 -    GUEST_HANDLE(dom0_getdomaininfo_t) buffer;
  33.293 +    XEN_GUEST_HANDLE(dom0_getdomaininfo_t) buffer;
  33.294      /* OUT variables. */
  33.295      uint32_t              num_domains;
  33.296  } dom0_getdomaininfolist_t;
  33.297 -DEFINE_GUEST_HANDLE(dom0_getdomaininfolist_t);
  33.298 +DEFINE_XEN_GUEST_HANDLE(dom0_getdomaininfolist_t);
  33.299  
  33.300  #define DOM0_PLATFORM_QUIRK      39
  33.301  #define QUIRK_NOIRQBALANCING      1 /* Do not restrict IO-APIC RTE targets */
  33.302 @@ -411,7 +411,7 @@ typedef struct dom0_platform_quirk {
  33.303      /* IN variables. */
  33.304      uint32_t quirk_id;
  33.305  } dom0_platform_quirk_t;
  33.306 -DEFINE_GUEST_HANDLE(dom0_platform_quirk_t);
  33.307 +DEFINE_XEN_GUEST_HANDLE(dom0_platform_quirk_t);
  33.308  
  33.309  #define DOM0_PHYSICAL_MEMORY_MAP 40
  33.310  typedef struct dom0_memory_map_entry {
  33.311 @@ -419,36 +419,36 @@ typedef struct dom0_memory_map_entry {
  33.312      uint32_t flags; /* reserved */
  33.313      uint8_t  is_ram;
  33.314  } dom0_memory_map_entry_t;
  33.315 -DEFINE_GUEST_HANDLE(dom0_memory_map_entry_t);
  33.316 +DEFINE_XEN_GUEST_HANDLE(dom0_memory_map_entry_t);
  33.317  typedef struct dom0_physical_memory_map {
  33.318      /* IN variables. */
  33.319      uint32_t max_map_entries;
  33.320      /* OUT variables. */
  33.321      uint32_t nr_map_entries;
  33.322 -    GUEST_HANDLE(dom0_memory_map_entry_t) memory_map;
  33.323 +    XEN_GUEST_HANDLE(dom0_memory_map_entry_t) memory_map;
  33.324  } dom0_physical_memory_map_t;
  33.325 -DEFINE_GUEST_HANDLE(dom0_physical_memory_map_t);
  33.326 +DEFINE_XEN_GUEST_HANDLE(dom0_physical_memory_map_t);
  33.327  
  33.328  #define DOM0_MAX_VCPUS 41
  33.329  typedef struct dom0_max_vcpus {
  33.330      domid_t  domain;        /* domain to be affected */
  33.331      uint32_t max;           /* maximum number of vcpus */
  33.332  } dom0_max_vcpus_t;
  33.333 -DEFINE_GUEST_HANDLE(dom0_max_vcpus_t);
  33.334 +DEFINE_XEN_GUEST_HANDLE(dom0_max_vcpus_t);
  33.335  
  33.336  #define DOM0_SETDOMAINHANDLE 44
  33.337  typedef struct dom0_setdomainhandle {
  33.338      domid_t domain;
  33.339      xen_domain_handle_t handle;
  33.340  } dom0_setdomainhandle_t;
  33.341 -DEFINE_GUEST_HANDLE(dom0_setdomainhandle_t);
  33.342 +DEFINE_XEN_GUEST_HANDLE(dom0_setdomainhandle_t);
  33.343  
  33.344  #define DOM0_SETDEBUGGING 45
  33.345  typedef struct dom0_setdebugging {
  33.346      domid_t domain;
  33.347      uint8_t enable;
  33.348  } dom0_setdebugging_t;
  33.349 -DEFINE_GUEST_HANDLE(dom0_setdebugging_t);
  33.350 +DEFINE_XEN_GUEST_HANDLE(dom0_setdebugging_t);
  33.351  
  33.352  #define DOM0_IRQ_PERMISSION 46
  33.353  typedef struct dom0_irq_permission {
  33.354 @@ -456,7 +456,7 @@ typedef struct dom0_irq_permission {
  33.355      uint8_t pirq;
  33.356      uint8_t allow_access;    /* flag to specify enable/disable of IRQ access */
  33.357  } dom0_irq_permission_t;
  33.358 -DEFINE_GUEST_HANDLE(dom0_irq_permission_t);
  33.359 +DEFINE_XEN_GUEST_HANDLE(dom0_irq_permission_t);
  33.360  
  33.361  #define DOM0_IOMEM_PERMISSION 47
  33.362  typedef struct dom0_iomem_permission {
  33.363 @@ -465,14 +465,14 @@ typedef struct dom0_iomem_permission {
  33.364      unsigned long nr_mfns;    /* number of pages in range (>0) */
  33.365      uint8_t allow_access;     /* allow (!0) or deny (0) access to range? */
  33.366  } dom0_iomem_permission_t;
  33.367 -DEFINE_GUEST_HANDLE(dom0_iomem_permission_t);
  33.368 +DEFINE_XEN_GUEST_HANDLE(dom0_iomem_permission_t);
  33.369  
  33.370  #define DOM0_HYPERCALL_INIT   48
  33.371  typedef struct dom0_hypercall_init {
  33.372      domid_t  domain;          /* domain to be affected */
  33.373      unsigned long mfn;        /* machine frame to be initialised */
  33.374  } dom0_hypercall_init_t;
  33.375 -DEFINE_GUEST_HANDLE(dom0_hypercall_init_t);
  33.376 +DEFINE_XEN_GUEST_HANDLE(dom0_hypercall_init_t);
  33.377  
  33.378  typedef struct dom0_op {
  33.379      uint32_t cmd;
  33.380 @@ -518,7 +518,7 @@ typedef struct dom0_op {
  33.381          uint8_t                       pad[128];
  33.382      } u;
  33.383  } dom0_op_t;
  33.384 -DEFINE_GUEST_HANDLE(dom0_op_t);
  33.385 +DEFINE_XEN_GUEST_HANDLE(dom0_op_t);
  33.386  
  33.387  #endif /* __XEN_PUBLIC_DOM0_OPS_H__ */
  33.388  
    34.1 --- a/xen/include/public/event_channel.h	Thu Apr 27 09:56:21 2006 +0100
    34.2 +++ b/xen/include/public/event_channel.h	Thu Apr 27 13:38:21 2006 +0100
    34.3 @@ -10,7 +10,7 @@
    34.4  #define __XEN_PUBLIC_EVENT_CHANNEL_H__
    34.5  
    34.6  typedef uint32_t evtchn_port_t;
    34.7 -DEFINE_GUEST_HANDLE(evtchn_port_t);
    34.8 +DEFINE_XEN_GUEST_HANDLE(evtchn_port_t);
    34.9  
   34.10  /*
   34.11   * EVTCHNOP_alloc_unbound: Allocate a port in domain <dom> and mark as
   34.12 @@ -196,7 +196,7 @@ typedef struct evtchn_op {
   34.13          evtchn_unmask_t           unmask;
   34.14      } u;
   34.15  } evtchn_op_t;
   34.16 -DEFINE_GUEST_HANDLE(evtchn_op_t);
   34.17 +DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
   34.18  
   34.19  #endif /* __XEN_PUBLIC_EVENT_CHANNEL_H__ */
   34.20  
    35.1 --- a/xen/include/public/grant_table.h	Thu Apr 27 09:56:21 2006 +0100
    35.2 +++ b/xen/include/public/grant_table.h	Thu Apr 27 13:38:21 2006 +0100
    35.3 @@ -167,7 +167,7 @@ typedef struct gnttab_map_grant_ref {
    35.4      grant_handle_t handle;
    35.5      uint64_t dev_bus_addr;
    35.6  } gnttab_map_grant_ref_t;
    35.7 -DEFINE_GUEST_HANDLE(gnttab_map_grant_ref_t);
    35.8 +DEFINE_XEN_GUEST_HANDLE(gnttab_map_grant_ref_t);
    35.9  
   35.10  /*
   35.11   * GNTTABOP_unmap_grant_ref: Destroy one or more grant-reference mappings
   35.12 @@ -189,7 +189,7 @@ typedef struct gnttab_unmap_grant_ref {
   35.13      /* OUT parameters. */
   35.14      int16_t  status;              /* GNTST_* */
   35.15  } gnttab_unmap_grant_ref_t;
   35.16 -DEFINE_GUEST_HANDLE(gnttab_unmap_grant_ref_t);
   35.17 +DEFINE_XEN_GUEST_HANDLE(gnttab_unmap_grant_ref_t);
   35.18  
   35.19  /*
   35.20   * GNTTABOP_setup_table: Set up a grant table for <dom> comprising at least
   35.21 @@ -207,9 +207,9 @@ typedef struct gnttab_setup_table {
   35.22      uint32_t nr_frames;
   35.23      /* OUT parameters. */
   35.24      int16_t  status;              /* GNTST_* */
   35.25 -    GUEST_HANDLE(ulong) frame_list;
   35.26 +    XEN_GUEST_HANDLE(ulong) frame_list;
   35.27  } gnttab_setup_table_t;
   35.28 -DEFINE_GUEST_HANDLE(gnttab_setup_table_t);
   35.29 +DEFINE_XEN_GUEST_HANDLE(gnttab_setup_table_t);
   35.30  
   35.31  /*
   35.32   * GNTTABOP_dump_table: Dump the contents of the grant table to the
   35.33 @@ -222,7 +222,7 @@ typedef struct gnttab_dump_table {
   35.34      /* OUT parameters. */
   35.35      int16_t status;               /* GNTST_* */
   35.36  } gnttab_dump_table_t;
   35.37 -DEFINE_GUEST_HANDLE(gnttab_dump_table_t);
   35.38 +DEFINE_XEN_GUEST_HANDLE(gnttab_dump_table_t);
   35.39  
   35.40  /*
   35.41   * GNTTABOP_transfer_grant_ref: Transfer <frame> to a foreign domain. The
   35.42 @@ -241,7 +241,7 @@ typedef struct gnttab_transfer {
   35.43      /* OUT parameters. */
   35.44      int16_t       status;
   35.45  } gnttab_transfer_t;
   35.46 -DEFINE_GUEST_HANDLE(gnttab_transfer_t);
   35.47 +DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_t);
   35.48  
   35.49  /*
   35.50   * Bitfield values for update_pin_status.flags.
    36.1 --- a/xen/include/public/memory.h	Thu Apr 27 09:56:21 2006 +0100
    36.2 +++ b/xen/include/public/memory.h	Thu Apr 27 13:38:21 2006 +0100
    36.3 @@ -29,7 +29,7 @@ typedef struct xen_memory_reservation {
    36.4       *   OUT: GMFN bases of extents that were allocated
    36.5       *   (NB. This command also updates the mach_to_phys translation table)
    36.6       */
    36.7 -    GUEST_HANDLE(ulong) extent_start;
    36.8 +    XEN_GUEST_HANDLE(ulong) extent_start;
    36.9  
   36.10      /* Number of extents, and size/alignment of each (2^extent_order pages). */
   36.11      unsigned long  nr_extents;
   36.12 @@ -50,7 +50,7 @@ typedef struct xen_memory_reservation {
   36.13      domid_t        domid;
   36.14  
   36.15  } xen_memory_reservation_t;
   36.16 -DEFINE_GUEST_HANDLE(xen_memory_reservation_t);
   36.17 +DEFINE_XEN_GUEST_HANDLE(xen_memory_reservation_t);
   36.18  
   36.19  /*
   36.20   * Returns the maximum machine frame number of mapped RAM in this system.
   36.21 @@ -86,7 +86,7 @@ typedef struct xen_machphys_mfn_list {
   36.22       * any large discontiguities in the machine address space, 2MB gaps in
   36.23       * the machphys table will be represented by an MFN base of zero.
   36.24       */
   36.25 -    GUEST_HANDLE(ulong) extent_start;
   36.26 +    XEN_GUEST_HANDLE(ulong) extent_start;
   36.27  
   36.28      /*
   36.29       * Number of extents written to the above array. This will be smaller
   36.30 @@ -94,7 +94,7 @@ typedef struct xen_machphys_mfn_list {
   36.31       */
   36.32      unsigned int nr_extents;
   36.33  } xen_machphys_mfn_list_t;
   36.34 -DEFINE_GUEST_HANDLE(xen_machphys_mfn_list_t);
   36.35 +DEFINE_XEN_GUEST_HANDLE(xen_machphys_mfn_list_t);
   36.36  
   36.37  /*
   36.38   * Sets the GPFN at which a particular page appears in the specified guest's
   36.39 @@ -117,7 +117,7 @@ typedef struct xen_add_to_physmap {
   36.40      /* GPFN where the source mapping page should appear. */
   36.41      unsigned long gpfn;
   36.42  } xen_add_to_physmap_t;
   36.43 -DEFINE_GUEST_HANDLE(xen_add_to_physmap_t);
   36.44 +DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
   36.45  
   36.46  /*
   36.47   * Translates a list of domain-specific GPFNs into MFNs. Returns a -ve error
   36.48 @@ -132,15 +132,15 @@ typedef struct xen_translate_gpfn_list {
   36.49      unsigned long nr_gpfns;
   36.50  
   36.51      /* List of GPFNs to translate. */
   36.52 -    GUEST_HANDLE(ulong) gpfn_list;
   36.53 +    XEN_GUEST_HANDLE(ulong) gpfn_list;
   36.54  
   36.55      /*
   36.56       * Output list to contain MFN translations. May be the same as the input
   36.57       * list (in which case each input GPFN is overwritten with the output MFN).
   36.58       */
   36.59 -    GUEST_HANDLE(ulong) mfn_list;
   36.60 +    XEN_GUEST_HANDLE(ulong) mfn_list;
   36.61  } xen_translate_gpfn_list_t;
   36.62 -DEFINE_GUEST_HANDLE(xen_translate_gpfn_list_t);
   36.63 +DEFINE_XEN_GUEST_HANDLE(xen_translate_gpfn_list_t);
   36.64  
   36.65  #endif /* __XEN_PUBLIC_MEMORY_H__ */
   36.66  
    37.1 --- a/xen/include/public/nmi.h	Thu Apr 27 09:56:21 2006 +0100
    37.2 +++ b/xen/include/public/nmi.h	Thu Apr 27 13:38:21 2006 +0100
    37.3 @@ -38,7 +38,7 @@ typedef struct xennmi_callback {
    37.4      unsigned long handler_address;
    37.5      unsigned long pad;
    37.6  } xennmi_callback_t;
    37.7 -DEFINE_GUEST_HANDLE(xennmi_callback_t);
    37.8 +DEFINE_XEN_GUEST_HANDLE(xennmi_callback_t);
    37.9  
   37.10  /*
   37.11   * Deregister NMI callback for this (calling) VCPU.
    38.1 --- a/xen/include/public/physdev.h	Thu Apr 27 09:56:21 2006 +0100
    38.2 +++ b/xen/include/public/physdev.h	Thu Apr 27 13:38:21 2006 +0100
    38.3 @@ -56,7 +56,7 @@ typedef struct physdev_op {
    38.4          physdevop_irq_t                   irq_op;
    38.5      } u;
    38.6  } physdev_op_t;
    38.7 -DEFINE_GUEST_HANDLE(physdev_op_t);
    38.8 +DEFINE_XEN_GUEST_HANDLE(physdev_op_t);
    38.9  
   38.10  #endif /* __XEN_PUBLIC_PHYSDEV_H__ */
   38.11  
    39.1 --- a/xen/include/public/sched.h	Thu Apr 27 09:56:21 2006 +0100
    39.2 +++ b/xen/include/public/sched.h	Thu Apr 27 13:38:21 2006 +0100
    39.3 @@ -49,7 +49,7 @@
    39.4  typedef struct sched_shutdown {
    39.5      unsigned int reason; /* SHUTDOWN_* */
    39.6  } sched_shutdown_t;
    39.7 -DEFINE_GUEST_HANDLE(sched_shutdown_t);
    39.8 +DEFINE_XEN_GUEST_HANDLE(sched_shutdown_t);
    39.9  
   39.10  /*
   39.11   * Poll a set of event-channel ports. Return when one or more are pending. An
   39.12 @@ -58,11 +58,11 @@ DEFINE_GUEST_HANDLE(sched_shutdown_t);
   39.13   */
   39.14  #define SCHEDOP_poll        3
   39.15  typedef struct sched_poll {
   39.16 -    GUEST_HANDLE(evtchn_port_t) ports;
   39.17 +    XEN_GUEST_HANDLE(evtchn_port_t) ports;
   39.18      unsigned int nr_ports;
   39.19      uint64_t timeout;
   39.20  } sched_poll_t;
   39.21 -DEFINE_GUEST_HANDLE(sched_poll_t);
   39.22 +DEFINE_XEN_GUEST_HANDLE(sched_poll_t);
   39.23  
   39.24  /*
   39.25   * Declare a shutdown for another domain. The main use of this function is
   39.26 @@ -75,7 +75,7 @@ typedef struct sched_remote_shutdown {
   39.27      domid_t domain_id;         /* Remote domain ID */
   39.28      unsigned int reason;       /* SHUTDOWN_xxx reason */
   39.29  } sched_remote_shutdown_t;
   39.30 -DEFINE_GUEST_HANDLE(sched_remote_shutdown_t);
   39.31 +DEFINE_XEN_GUEST_HANDLE(sched_remote_shutdown_t);
   39.32  
   39.33  /*
   39.34   * Reason codes for SCHEDOP_shutdown. These may be interpreted by control
    40.1 --- a/xen/include/public/xen.h	Thu Apr 27 09:56:21 2006 +0100
    40.2 +++ b/xen/include/public/xen.h	Thu Apr 27 13:38:21 2006 +0100
    40.3 @@ -185,7 +185,7 @@ typedef struct mmuext_op {
    40.4          void *vcpumask;
    40.5      } arg2;
    40.6  } mmuext_op_t;
    40.7 -DEFINE_GUEST_HANDLE(mmuext_op_t);
    40.8 +DEFINE_XEN_GUEST_HANDLE(mmuext_op_t);
    40.9  #endif
   40.10  
   40.11  /* These are passed as 'flags' to update_va_mapping. They can be ORed. */
   40.12 @@ -252,7 +252,7 @@ typedef struct mmu_update {
   40.13      uint64_t ptr;       /* Machine address of PTE. */
   40.14      uint64_t val;       /* New contents of PTE.    */
   40.15  } mmu_update_t;
   40.16 -DEFINE_GUEST_HANDLE(mmu_update_t);
   40.17 +DEFINE_XEN_GUEST_HANDLE(mmu_update_t);
   40.18  
   40.19  /*
   40.20   * Send an array of these to HYPERVISOR_multicall().
   40.21 @@ -262,7 +262,7 @@ typedef struct multicall_entry {
   40.22      unsigned long op, result;
   40.23      unsigned long args[6];
   40.24  } multicall_entry_t;
   40.25 -DEFINE_GUEST_HANDLE(multicall_entry_t);
   40.26 +DEFINE_XEN_GUEST_HANDLE(multicall_entry_t);
   40.27  
   40.28  /*
   40.29   * Event channel endpoints per domain:
    41.1 --- a/xen/include/public/xenoprof.h	Thu Apr 27 09:56:21 2006 +0100
    41.2 +++ b/xen/include/public/xenoprof.h	Thu Apr 27 13:38:21 2006 +0100
    41.3 @@ -52,7 +52,7 @@ typedef struct xenoprof_buf {
    41.4      uint64_t lost_samples;
    41.5      struct event_log event_log[1];
    41.6  } xenoprof_buf_t;
    41.7 -DEFINE_GUEST_HANDLE(xenoprof_buf_t);
    41.8 +DEFINE_XEN_GUEST_HANDLE(xenoprof_buf_t);
    41.9  
   41.10  typedef struct xenoprof_init {
   41.11      int32_t  max_samples;
   41.12 @@ -63,7 +63,7 @@ typedef struct xenoprof_init {
   41.13      uint64_t buf_maddr;
   41.14      char cpu_type[XENOPROF_CPU_TYPE_SIZE];
   41.15  } xenoprof_init_t;
   41.16 -DEFINE_GUEST_HANDLE(xenoprof_init_t);
   41.17 +DEFINE_XEN_GUEST_HANDLE(xenoprof_init_t);
   41.18  
   41.19  typedef struct xenoprof_counter {
   41.20      uint32_t ind;
   41.21 @@ -75,7 +75,7 @@ typedef struct xenoprof_counter {
   41.22      uint32_t user;
   41.23      uint64_t unit_mask;
   41.24  } xenoprof_counter_t;
   41.25 -DEFINE_GUEST_HANDLE(xenoprof_counter_t);
   41.26 +DEFINE_XEN_GUEST_HANDLE(xenoprof_counter_t);
   41.27  
   41.28  
   41.29  #endif /* __XEN_PUBLIC_XENOPROF_H__ */
    42.1 --- a/xen/include/xen/console.h	Thu Apr 27 09:56:21 2006 +0100
    42.2 +++ b/xen/include/xen/console.h	Thu Apr 27 13:38:21 2006 +0100
    42.3 @@ -14,7 +14,7 @@ extern spinlock_t console_lock;
    42.4  
    42.5  void set_printk_prefix(const char *prefix);
    42.6  
    42.7 -long read_console_ring(GUEST_HANDLE(char), u32 *, int);
    42.8 +long read_console_ring(XEN_GUEST_HANDLE(char), u32 *, int);
    42.9  
   42.10  void init_console(void);
   42.11  void console_endboot(int disable_vga);
    43.1 --- a/xen/include/xen/hypercall.h	Thu Apr 27 09:56:21 2006 +0100
    43.2 +++ b/xen/include/xen/hypercall.h	Thu Apr 27 13:38:21 2006 +0100
    43.3 @@ -25,20 +25,20 @@ do_sched_op_compat(
    43.4  extern long
    43.5  do_sched_op(
    43.6      int cmd,
    43.7 -    GUEST_HANDLE(void) arg);
    43.8 +    XEN_GUEST_HANDLE(void) arg);
    43.9  
   43.10  extern long
   43.11  do_dom0_op(
   43.12 -    GUEST_HANDLE(dom0_op_t) u_dom0_op);
   43.13 +    XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op);
   43.14  
   43.15  extern long
   43.16  do_memory_op(
   43.17      int cmd,
   43.18 -    GUEST_HANDLE(void) arg);
   43.19 +    XEN_GUEST_HANDLE(void) arg);
   43.20  
   43.21  extern long
   43.22  do_multicall(
   43.23 -    GUEST_HANDLE(multicall_entry_t) call_list,
   43.24 +    XEN_GUEST_HANDLE(multicall_entry_t) call_list,
   43.25      unsigned int nr_calls);
   43.26  
   43.27  extern long
   43.28 @@ -47,23 +47,23 @@ do_set_timer_op(
   43.29  
   43.30  extern long
   43.31  do_event_channel_op(
   43.32 -    GUEST_HANDLE(evtchn_op_t) uop);
   43.33 +    XEN_GUEST_HANDLE(evtchn_op_t) uop);
   43.34  
   43.35  extern long
   43.36  do_xen_version(
   43.37      int cmd,
   43.38 -    GUEST_HANDLE(void) arg);
   43.39 +    XEN_GUEST_HANDLE(void) arg);
   43.40  
   43.41  extern long
   43.42  do_console_io(
   43.43      int cmd,
   43.44      int count,
   43.45 -    GUEST_HANDLE(char) buffer);
   43.46 +    XEN_GUEST_HANDLE(char) buffer);
   43.47  
   43.48  extern long
   43.49  do_grant_table_op(
   43.50      unsigned int cmd,
   43.51 -    GUEST_HANDLE(void) uop,
   43.52 +    XEN_GUEST_HANDLE(void) uop,
   43.53      unsigned int count);
   43.54  
   43.55  extern long
   43.56 @@ -75,15 +75,15 @@ extern long
   43.57  do_vcpu_op(
   43.58      int cmd,
   43.59      int vcpuid,
   43.60 -    GUEST_HANDLE(void) arg);
   43.61 +    XEN_GUEST_HANDLE(void) arg);
   43.62  
   43.63  extern long
   43.64  do_acm_op(
   43.65 -    GUEST_HANDLE(acm_op_t) u_acm_op);
   43.66 +    XEN_GUEST_HANDLE(acm_op_t) u_acm_op);
   43.67  
   43.68  extern long
   43.69  do_nmi_op(
   43.70      unsigned int cmd,
   43.71 -    GUEST_HANDLE(void) arg);
   43.72 +    XEN_GUEST_HANDLE(void) arg);
   43.73  
   43.74  #endif /* __XEN_HYPERCALL_H__ */
    44.1 --- a/xen/include/xen/sched.h	Thu Apr 27 09:56:21 2006 +0100
    44.2 +++ b/xen/include/xen/sched.h	Thu Apr 27 13:38:21 2006 +0100
    44.3 @@ -316,7 +316,7 @@ void startup_cpu_idle_loop(void);
    44.4   * It contains one character per argument as follows:
    44.5   *  'i' [unsigned] {char, int}
    44.6   *  'l' [unsigned] long
    44.7 - *  'h' guest handle (GUEST_HANDLE(foo))
    44.8 + *  'h' guest handle (XEN_GUEST_HANDLE(foo))
    44.9   */
   44.10  unsigned long hypercall_create_continuation(
   44.11      unsigned int op, const char *format, ...);