|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] xen: replace XEN_GUEST_HANDLE with XEN_GUEST_HANDLE_PARAM when appropriate
# HG changeset patch
# User Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1350488633 -3600
# Node ID 9eafdcd5ff0b55acaf65dd482179a3ca1db78482
# Parent 1eb4b2f7465f8c7c15fe1d6a198d53dda30372a9
xen: replace XEN_GUEST_HANDLE with XEN_GUEST_HANDLE_PARAM when appropriate
Note: these changes don't make any difference on x86.
Replace XEN_GUEST_HANDLE with XEN_GUEST_HANDLE_PARAM when it is used as
an hypercall argument.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/arm/domain.c
--- a/xen/arch/arm/domain.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/arm/domain.c Wed Oct 17 16:43:53 2012 +0100
@@ -519,7 +519,7 @@ void arch_dump_domain_info(struct domain
{
}
-long arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg)
+long arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg)
{
return -ENOSYS;
}
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/arm/domctl.c
--- a/xen/arch/arm/domctl.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/arm/domctl.c Wed Oct 17 16:43:53 2012 +0100
@@ -11,7 +11,7 @@
#include <public/domctl.h>
long arch_do_domctl(struct xen_domctl *domctl,
- XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
+ XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
{
return -ENOSYS;
}
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/arm/hvm.c
--- a/xen/arch/arm/hvm.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/arm/hvm.c Wed Oct 17 16:43:53 2012 +0100
@@ -11,7 +11,7 @@
#include <asm/hypercall.h>
-long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
+long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
long rc = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/arm/mm.c
--- a/xen/arch/arm/mm.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/arm/mm.c Wed Oct 17 16:43:53 2012 +0100
@@ -579,7 +579,7 @@ out:
}
-long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
+long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
int rc;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/arm/physdev.c
--- a/xen/arch/arm/physdev.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/arm/physdev.c Wed Oct 17 16:43:53 2012 +0100
@@ -11,7 +11,7 @@
#include <asm/hypercall.h>
-int do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg)
+int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
printk("%s %d cmd=%d: not implemented yet\n", __func__, __LINE__, cmd);
return -ENOSYS;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/arm/sysctl.c
--- a/xen/arch/arm/sysctl.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/arm/sysctl.c Wed Oct 17 16:43:53 2012 +0100
@@ -13,7 +13,7 @@
#include <public/sysctl.h>
long arch_do_sysctl(struct xen_sysctl *sysctl,
- XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
+ XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
{
return -ENOSYS;
}
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/compat.c
--- a/xen/arch/x86/compat.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/compat.c Wed Oct 17 16:43:53 2012 +0100
@@ -27,7 +27,7 @@ ret_t do_physdev_op_compat(XEN_GUEST_HAN
#ifndef COMPAT
/* Legacy hypercall (as of 0x00030202). */
-long do_event_channel_op_compat(XEN_GUEST_HANDLE(evtchn_op_t) uop)
+long do_event_channel_op_compat(XEN_GUEST_HANDLE_PARAM(evtchn_op_t) uop)
{
struct evtchn_op op;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/cpu/mcheck/mce.c
--- a/xen/arch/x86/cpu/mcheck/mce.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/cpu/mcheck/mce.c Wed Oct 17 16:43:53 2012 +0100
@@ -1289,7 +1289,7 @@ CHECK_mcinfo_recovery;
# undef xen_mcinfo_recovery
/* Machine Check Architecture Hypercall */
-long do_mca(XEN_GUEST_HANDLE(xen_mc_t) u_xen_mc)
+long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc)
{
long ret = 0;
struct xen_mc curop, *op = &curop;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/domain.c Wed Oct 17 16:43:53 2012 +0100
@@ -1077,7 +1077,7 @@ map_vcpu_info(struct vcpu *v, unsigned l
long
arch_do_vcpu_op(
- int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg)
+ int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg)
{
long rc = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/domctl.c Wed Oct 17 16:43:53 2012 +0100
@@ -48,7 +48,7 @@ static int gdbsx_guest_mem_io(
long arch_do_domctl(
struct xen_domctl *domctl,
- XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
+ XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
{
long ret = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/efi/runtime.c
--- a/xen/arch/x86/efi/runtime.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/efi/runtime.c Wed Oct 17 16:43:53 2012 +0100
@@ -184,7 +184,7 @@ int efi_get_info(uint32_t idx, union xen
return 0;
}
-static long gwstrlen(XEN_GUEST_HANDLE(CHAR16) str)
+static long gwstrlen(XEN_GUEST_HANDLE_PARAM(CHAR16) str)
{
unsigned long len;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/hvm/hvm.c Wed Oct 17 16:43:53 2012 +0100
@@ -3091,14 +3091,14 @@ static int grant_table_op_is_allowed(uns
}
static long hvm_grant_table_op(
- unsigned int cmd, XEN_GUEST_HANDLE(void) uop, unsigned int count)
+ unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count)
{
if ( !grant_table_op_is_allowed(cmd) )
return -ENOSYS; /* all other commands need auditing */
return do_grant_table_op(cmd, uop, count);
}
-static long hvm_memory_op(int cmd, XEN_GUEST_HANDLE(void) arg)
+static long hvm_memory_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
long rc;
@@ -3116,7 +3116,7 @@ static long hvm_memory_op(int cmd, XEN_G
return do_memory_op(cmd, arg);
}
-static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg)
+static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
switch ( cmd )
{
@@ -3132,7 +3132,7 @@ static long hvm_physdev_op(int cmd, XEN_
}
static long hvm_vcpu_op(
- int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg)
+ int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
{
long rc;
@@ -3163,7 +3163,7 @@ typedef unsigned long hvm_hypercall_t(
[ __HYPERVISOR_ ## x ] = (hvm_hypercall_t *) do_ ## x
static long hvm_grant_table_op_compat32(unsigned int cmd,
- XEN_GUEST_HANDLE(void) uop,
+ XEN_GUEST_HANDLE_PARAM(void) uop,
unsigned int count)
{
if ( !grant_table_op_is_allowed(cmd) )
@@ -3171,7 +3171,7 @@ static long hvm_grant_table_op_compat32(
return compat_grant_table_op(cmd, uop, count);
}
-static long hvm_memory_op_compat32(int cmd, XEN_GUEST_HANDLE(void) arg)
+static long hvm_memory_op_compat32(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
int rc;
@@ -3190,7 +3190,7 @@ static long hvm_memory_op_compat32(int c
}
static long hvm_vcpu_op_compat32(
- int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg)
+ int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
{
long rc;
@@ -3214,7 +3214,7 @@ static long hvm_vcpu_op_compat32(
}
static long hvm_physdev_op_compat32(
- int cmd, XEN_GUEST_HANDLE(void) arg)
+ int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
switch ( cmd )
{
@@ -3380,7 +3380,7 @@ void hvm_hypercall_page_initialise(struc
}
static int hvmop_set_pci_intx_level(
- XEN_GUEST_HANDLE(xen_hvm_set_pci_intx_level_t) uop)
+ XEN_GUEST_HANDLE_PARAM(xen_hvm_set_pci_intx_level_t) uop)
{
struct xen_hvm_set_pci_intx_level op;
struct domain *d;
@@ -3547,7 +3547,7 @@ static void hvm_s3_resume(struct domain
}
static int hvmop_set_isa_irq_level(
- XEN_GUEST_HANDLE(xen_hvm_set_isa_irq_level_t) uop)
+ XEN_GUEST_HANDLE_PARAM(xen_hvm_set_isa_irq_level_t) uop)
{
struct xen_hvm_set_isa_irq_level op;
struct domain *d;
@@ -3591,7 +3591,7 @@ static int hvmop_set_isa_irq_level(
}
static int hvmop_set_pci_link_route(
- XEN_GUEST_HANDLE(xen_hvm_set_pci_link_route_t) uop)
+ XEN_GUEST_HANDLE_PARAM(xen_hvm_set_pci_link_route_t) uop)
{
struct xen_hvm_set_pci_link_route op;
struct domain *d;
@@ -3624,7 +3624,7 @@ static int hvmop_set_pci_link_route(
}
static int hvmop_inject_msi(
- XEN_GUEST_HANDLE(xen_hvm_inject_msi_t) uop)
+ XEN_GUEST_HANDLE_PARAM(xen_hvm_inject_msi_t) uop)
{
struct xen_hvm_inject_msi op;
struct domain *d;
@@ -3708,7 +3708,7 @@ static int hvm_replace_event_channel(str
return 0;
}
-long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
+long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct domain *curr_d = current->domain;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/microcode.c
--- a/xen/arch/x86/microcode.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/microcode.c Wed Oct 17 16:43:53 2012 +0100
@@ -195,7 +195,7 @@ static long do_microcode_update(void *_i
return error;
}
-int microcode_update(XEN_GUEST_HANDLE(const_void) buf, unsigned long len)
+int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void) buf, unsigned long len)
{
int ret;
struct microcode_info *info;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/mm.c Wed Oct 17 16:43:53 2012 +0100
@@ -2652,7 +2652,7 @@ static void put_pg_owner(struct domain *
}
static inline int vcpumask_to_pcpumask(
- struct domain *d, XEN_GUEST_HANDLE(const_void) bmap, cpumask_t *pmask)
+ struct domain *d, XEN_GUEST_HANDLE_PARAM(const_void) bmap, cpumask_t
*pmask)
{
unsigned int vcpu_id, vcpu_bias, offs;
unsigned long vmask;
@@ -2692,9 +2692,9 @@ static inline int vcpumask_to_pcpumask(
#define fixunmap_domain_page(ptr) ((void)(ptr))
long do_mmuext_op(
- XEN_GUEST_HANDLE(mmuext_op_t) uops,
+ XEN_GUEST_HANDLE_PARAM(mmuext_op_t) uops,
unsigned int count,
- XEN_GUEST_HANDLE(uint) pdone,
+ XEN_GUEST_HANDLE_PARAM(uint) pdone,
unsigned int foreigndom)
{
struct mmuext_op op;
@@ -3151,9 +3151,9 @@ long do_mmuext_op(
}
long do_mmu_update(
- XEN_GUEST_HANDLE(mmu_update_t) ureqs,
+ XEN_GUEST_HANDLE_PARAM(mmu_update_t) ureqs,
unsigned int count,
- XEN_GUEST_HANDLE(uint) pdone,
+ XEN_GUEST_HANDLE_PARAM(uint) pdone,
unsigned int foreigndom)
{
struct mmu_update req;
@@ -4098,7 +4098,7 @@ long set_gdt(struct vcpu *v,
}
-long do_set_gdt(XEN_GUEST_HANDLE(ulong) frame_list, unsigned int entries)
+long do_set_gdt(XEN_GUEST_HANDLE_PARAM(ulong) frame_list, unsigned int entries)
{
int nr_pages = (entries + 511) / 512;
unsigned long frames[16];
@@ -4370,7 +4370,7 @@ static int xenmem_add_to_physmap(struct
return xenmem_add_to_physmap_once(d, xatp);
}
-long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
+long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
int rc;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/mm/hap/hap.c
--- a/xen/arch/x86/mm/hap/hap.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/mm/hap/hap.c Wed Oct 17 16:43:53 2012 +0100
@@ -571,7 +571,7 @@ void hap_teardown(struct domain *d)
}
int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
- XEN_GUEST_HANDLE(void) u_domctl)
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl)
{
int rc, preempted = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/mm/mem_event.c
--- a/xen/arch/x86/mm/mem_event.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/mm/mem_event.c Wed Oct 17 16:43:53 2012 +0100
@@ -512,7 +512,7 @@ void mem_event_cleanup(struct domain *d)
}
int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec,
- XEN_GUEST_HANDLE(void) u_domctl)
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl)
{
int rc;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/mm/paging.c
--- a/xen/arch/x86/mm/paging.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/mm/paging.c Wed Oct 17 16:43:53 2012 +0100
@@ -654,7 +654,7 @@ void paging_vcpu_init(struct vcpu *v)
int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
- XEN_GUEST_HANDLE(void) u_domctl)
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl)
{
int rc;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/mm/shadow/common.c Wed Oct 17 16:43:53 2012 +0100
@@ -3641,7 +3641,7 @@ out:
int shadow_domctl(struct domain *d,
xen_domctl_shadow_op_t *sc,
- XEN_GUEST_HANDLE(void) u_domctl)
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl)
{
int rc, preempted = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/oprofile/xenoprof.c
--- a/xen/arch/x86/oprofile/xenoprof.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/oprofile/xenoprof.c Wed Oct 17 16:43:53 2012 +0100
@@ -17,7 +17,7 @@
#include "op_counter.h"
-int xenoprof_arch_counter(XEN_GUEST_HANDLE(void) arg)
+int xenoprof_arch_counter(XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct xenoprof_counter counter;
@@ -37,7 +37,7 @@ int xenoprof_arch_counter(XEN_GUEST_HAND
return 0;
}
-int xenoprof_arch_ibs_counter(XEN_GUEST_HANDLE(void) arg)
+int xenoprof_arch_ibs_counter(XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct xenoprof_ibs_counter ibs_counter;
@@ -54,7 +54,7 @@ int xenoprof_arch_ibs_counter(XEN_GUEST_
return 0;
}
-int compat_oprof_arch_counter(XEN_GUEST_HANDLE(void) arg)
+int compat_oprof_arch_counter(XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct compat_oprof_counter counter;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/physdev.c
--- a/xen/arch/x86/physdev.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/physdev.c Wed Oct 17 16:43:53 2012 +0100
@@ -258,7 +258,7 @@ int physdev_unmap_pirq(domid_t domid, in
}
#endif /* COMPAT */
-ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg)
+ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
int irq;
ret_t ret;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/sysctl.c
--- a/xen/arch/x86/sysctl.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/sysctl.c Wed Oct 17 16:43:53 2012 +0100
@@ -58,7 +58,7 @@ long cpu_down_helper(void *data)
}
long arch_do_sysctl(
- struct xen_sysctl *sysctl, XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
+ struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
{
long ret = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/traps.c Wed Oct 17 16:43:53 2012 +0100
@@ -3536,7 +3536,7 @@ int send_guest_trap(struct domain *d, ui
}
-long do_set_trap_table(XEN_GUEST_HANDLE(const_trap_info_t) traps)
+long do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps)
{
struct trap_info cur;
struct vcpu *curr = current;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/x86_64/compat/mm.c
--- a/xen/arch/x86/x86_64/compat/mm.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/x86_64/compat/mm.c Wed Oct 17 16:43:53 2012 +0100
@@ -5,7 +5,7 @@
#include <asm/mem_event.h>
#include <asm/mem_sharing.h>
-int compat_set_gdt(XEN_GUEST_HANDLE(uint) frame_list, unsigned int entries)
+int compat_set_gdt(XEN_GUEST_HANDLE_PARAM(uint) frame_list, unsigned int
entries)
{
unsigned int i, nr_pages = (entries + 511) / 512;
unsigned long frames[16];
@@ -44,7 +44,7 @@ int compat_update_descriptor(u32 pa_lo,
desc_lo | ((u64)desc_hi << 32));
}
-int compat_arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
+int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct compat_machphys_mfn_list xmml;
l2_pgentry_t l2e;
@@ -260,14 +260,14 @@ int compat_update_va_mapping_otherdomain
DEFINE_XEN_GUEST_HANDLE(mmuext_op_compat_t);
-int compat_mmuext_op(XEN_GUEST_HANDLE(mmuext_op_compat_t) cmp_uops,
+int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops,
unsigned int count,
- XEN_GUEST_HANDLE(uint) pdone,
+ XEN_GUEST_HANDLE_PARAM(uint) pdone,
unsigned int foreigndom)
{
unsigned int i, preempt_mask;
int rc = 0;
- XEN_GUEST_HANDLE(mmuext_op_t) nat_ops;
+ XEN_GUEST_HANDLE_PARAM(mmuext_op_t) nat_ops;
preempt_mask = count & MMU_UPDATE_PREEMPTED;
count ^= preempt_mask;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/x86_64/domain.c
--- a/xen/arch/x86/x86_64/domain.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/x86_64/domain.c Wed Oct 17 16:43:53 2012 +0100
@@ -23,7 +23,7 @@ CHECK_vcpu_get_physid;
int
arch_compat_vcpu_op(
- int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg)
+ int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg)
{
int rc = -ENOSYS;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/x86_64/mm.c
--- a/xen/arch/x86/x86_64/mm.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/x86_64/mm.c Wed Oct 17 16:43:53 2012 +0100
@@ -1027,7 +1027,7 @@ void __init subarch_init_memory(void)
}
}
-long subarch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
+long subarch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct xen_machphys_mfn_list xmml;
l3_pgentry_t l3e;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/arch/x86/x86_64/traps.c Wed Oct 17 16:43:53 2012 +0100
@@ -519,7 +519,7 @@ static long unregister_guest_callback(st
}
-long do_callback_op(int cmd, XEN_GUEST_HANDLE(const_void) arg)
+long do_callback_op(int cmd, XEN_GUEST_HANDLE_PARAM(const_void) arg)
{
long ret;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/compat/domain.c
--- a/xen/common/compat/domain.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/compat/domain.c Wed Oct 17 16:43:53 2012 +0100
@@ -15,7 +15,7 @@
CHECK_vcpu_set_periodic_timer;
#undef xen_vcpu_set_periodic_timer
-int compat_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg)
+int compat_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct domain *d = current->domain;
struct vcpu *v;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/compat/grant_table.c
--- a/xen/common/compat/grant_table.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/compat/grant_table.c Wed Oct 17 16:43:53 2012 +0100
@@ -52,12 +52,12 @@ CHECK_gnttab_swap_grant_ref;
#undef xen_gnttab_swap_grant_ref
int compat_grant_table_op(unsigned int cmd,
- XEN_GUEST_HANDLE(void) cmp_uop,
+ XEN_GUEST_HANDLE_PARAM(void) cmp_uop,
unsigned int count)
{
int rc = 0;
unsigned int i;
- XEN_GUEST_HANDLE(void) cnt_uop;
+ XEN_GUEST_HANDLE_PARAM(void) cnt_uop;
set_xen_guest_handle(cnt_uop, NULL);
switch ( cmd )
@@ -206,7 +206,7 @@ int compat_grant_table_op(unsigned int c
}
if ( rc >= 0 )
{
- XEN_GUEST_HANDLE(gnttab_transfer_compat_t) xfer;
+ XEN_GUEST_HANDLE_PARAM(gnttab_transfer_compat_t) xfer;
xfer = guest_handle_cast(cmp_uop, gnttab_transfer_compat_t);
guest_handle_add_offset(xfer, i);
@@ -251,7 +251,7 @@ int compat_grant_table_op(unsigned int c
}
if ( rc >= 0 )
{
- XEN_GUEST_HANDLE(gnttab_copy_compat_t) copy;
+ XEN_GUEST_HANDLE_PARAM(gnttab_copy_compat_t) copy;
copy = guest_handle_cast(cmp_uop, gnttab_copy_compat_t);
guest_handle_add_offset(copy, i);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/compat/memory.c
--- a/xen/common/compat/memory.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/compat/memory.c Wed Oct 17 16:43:53 2012 +0100
@@ -13,7 +13,7 @@ CHECK_TYPE(domid);
#undef compat_domid_t
#undef xen_domid_t
-int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat)
+int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat)
{
int rc, split, op = cmd & MEMOP_CMD_MASK;
unsigned int start_extent = cmd >> MEMOP_EXTENT_SHIFT;
@@ -22,7 +22,7 @@ int compat_memory_op(unsigned int cmd, X
{
unsigned int i, end_extent = 0;
union {
- XEN_GUEST_HANDLE(void) hnd;
+ XEN_GUEST_HANDLE_PARAM(void) hnd;
struct xen_memory_reservation *rsrv;
struct xen_memory_exchange *xchg;
struct xen_remove_from_physmap *xrfp;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/domain.c
--- a/xen/common/domain.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/domain.c Wed Oct 17 16:43:53 2012 +0100
@@ -827,7 +827,7 @@ void vcpu_reset(struct vcpu *v)
}
-long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg)
+long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct domain *d = current->domain;
struct vcpu *v;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/domctl.c
--- a/xen/common/domctl.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/domctl.c Wed Oct 17 16:43:53 2012 +0100
@@ -239,7 +239,7 @@ void domctl_lock_release(void)
spin_unlock(¤t->domain->hypercall_deadlock_mutex);
}
-long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
+long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
{
long ret = 0;
struct xen_domctl curop, *op = &curop;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/event_channel.c
--- a/xen/common/event_channel.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/event_channel.c Wed Oct 17 16:43:53 2012 +0100
@@ -970,7 +970,7 @@ out:
}
-long do_event_channel_op(int cmd, XEN_GUEST_HANDLE(void) arg)
+long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
long rc;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/grant_table.c
--- a/xen/common/grant_table.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/grant_table.c Wed Oct 17 16:43:53 2012 +0100
@@ -833,7 +833,7 @@ __gnttab_map_grant_ref(
static long
gnttab_map_grant_ref(
- XEN_GUEST_HANDLE(gnttab_map_grant_ref_t) uop, unsigned int count)
+ XEN_GUEST_HANDLE_PARAM(gnttab_map_grant_ref_t) uop, unsigned int count)
{
int i;
struct gnttab_map_grant_ref op;
@@ -1102,7 +1102,7 @@ __gnttab_unmap_grant_ref(
static long
gnttab_unmap_grant_ref(
- XEN_GUEST_HANDLE(gnttab_unmap_grant_ref_t) uop, unsigned int count)
+ XEN_GUEST_HANDLE_PARAM(gnttab_unmap_grant_ref_t) uop, unsigned int count)
{
int i, c, partial_done, done = 0;
struct gnttab_unmap_grant_ref op;
@@ -1164,7 +1164,7 @@ __gnttab_unmap_and_replace(
static long
gnttab_unmap_and_replace(
- XEN_GUEST_HANDLE(gnttab_unmap_and_replace_t) uop, unsigned int count)
+ XEN_GUEST_HANDLE_PARAM(gnttab_unmap_and_replace_t) uop, unsigned int count)
{
int i, c, partial_done, done = 0;
struct gnttab_unmap_and_replace op;
@@ -1316,7 +1316,7 @@ active_alloc_failed:
static long
gnttab_setup_table(
- XEN_GUEST_HANDLE(gnttab_setup_table_t) uop, unsigned int count)
+ XEN_GUEST_HANDLE_PARAM(gnttab_setup_table_t) uop, unsigned int count)
{
struct gnttab_setup_table op;
struct domain *d;
@@ -1395,7 +1395,7 @@ gnttab_setup_table(
static long
gnttab_query_size(
- XEN_GUEST_HANDLE(gnttab_query_size_t) uop, unsigned int count)
+ XEN_GUEST_HANDLE_PARAM(gnttab_query_size_t) uop, unsigned int count)
{
struct gnttab_query_size op;
struct domain *d;
@@ -1517,7 +1517,7 @@ gnttab_prepare_for_transfer(
static long
gnttab_transfer(
- XEN_GUEST_HANDLE(gnttab_transfer_t) uop, unsigned int count)
+ XEN_GUEST_HANDLE_PARAM(gnttab_transfer_t) uop, unsigned int count)
{
struct domain *d = current->domain;
struct domain *e;
@@ -2125,7 +2125,7 @@ __gnttab_copy(
static long
gnttab_copy(
- XEN_GUEST_HANDLE(gnttab_copy_t) uop, unsigned int count)
+ XEN_GUEST_HANDLE_PARAM(gnttab_copy_t) uop, unsigned int count)
{
int i;
struct gnttab_copy op;
@@ -2144,7 +2144,7 @@ gnttab_copy(
}
static long
-gnttab_set_version(XEN_GUEST_HANDLE(gnttab_set_version_t uop))
+gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t uop))
{
gnttab_set_version_t op;
struct domain *d = current->domain;
@@ -2263,7 +2263,7 @@ out:
}
static long
-gnttab_get_status_frames(XEN_GUEST_HANDLE(gnttab_get_status_frames_t) uop,
+gnttab_get_status_frames(XEN_GUEST_HANDLE_PARAM(gnttab_get_status_frames_t)
uop,
int count)
{
gnttab_get_status_frames_t op;
@@ -2327,7 +2327,7 @@ out1:
}
static long
-gnttab_get_version(XEN_GUEST_HANDLE(gnttab_get_version_t uop))
+gnttab_get_version(XEN_GUEST_HANDLE_PARAM(gnttab_get_version_t uop))
{
gnttab_get_version_t op;
struct domain *d;
@@ -2412,7 +2412,7 @@ out:
}
static long
-gnttab_swap_grant_ref(XEN_GUEST_HANDLE(gnttab_swap_grant_ref_t uop),
+gnttab_swap_grant_ref(XEN_GUEST_HANDLE_PARAM(gnttab_swap_grant_ref_t uop),
unsigned int count)
{
int i;
@@ -2433,7 +2433,7 @@ gnttab_swap_grant_ref(XEN_GUEST_HANDLE(g
long
do_grant_table_op(
- unsigned int cmd, XEN_GUEST_HANDLE(void) uop, unsigned int count)
+ unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count)
{
long rc;
@@ -2445,7 +2445,7 @@ do_grant_table_op(
{
case GNTTABOP_map_grant_ref:
{
- XEN_GUEST_HANDLE(gnttab_map_grant_ref_t) map =
+ XEN_GUEST_HANDLE_PARAM(gnttab_map_grant_ref_t) map =
guest_handle_cast(uop, gnttab_map_grant_ref_t);
if ( unlikely(!guest_handle_okay(map, count)) )
goto out;
@@ -2459,7 +2459,7 @@ do_grant_table_op(
}
case GNTTABOP_unmap_grant_ref:
{
- XEN_GUEST_HANDLE(gnttab_unmap_grant_ref_t) unmap =
+ XEN_GUEST_HANDLE_PARAM(gnttab_unmap_grant_ref_t) unmap =
guest_handle_cast(uop, gnttab_unmap_grant_ref_t);
if ( unlikely(!guest_handle_okay(unmap, count)) )
goto out;
@@ -2473,7 +2473,7 @@ do_grant_table_op(
}
case GNTTABOP_unmap_and_replace:
{
- XEN_GUEST_HANDLE(gnttab_unmap_and_replace_t) unmap =
+ XEN_GUEST_HANDLE_PARAM(gnttab_unmap_and_replace_t) unmap =
guest_handle_cast(uop, gnttab_unmap_and_replace_t);
if ( unlikely(!guest_handle_okay(unmap, count)) )
goto out;
@@ -2497,7 +2497,7 @@ do_grant_table_op(
}
case GNTTABOP_transfer:
{
- XEN_GUEST_HANDLE(gnttab_transfer_t) transfer =
+ XEN_GUEST_HANDLE_PARAM(gnttab_transfer_t) transfer =
guest_handle_cast(uop, gnttab_transfer_t);
if ( unlikely(!guest_handle_okay(transfer, count)) )
goto out;
@@ -2511,7 +2511,7 @@ do_grant_table_op(
}
case GNTTABOP_copy:
{
- XEN_GUEST_HANDLE(gnttab_copy_t) copy =
+ XEN_GUEST_HANDLE_PARAM(gnttab_copy_t) copy =
guest_handle_cast(uop, gnttab_copy_t);
if ( unlikely(!guest_handle_okay(copy, count)) )
goto out;
@@ -2548,7 +2548,7 @@ do_grant_table_op(
}
case GNTTABOP_swap_grant_ref:
{
- XEN_GUEST_HANDLE(gnttab_swap_grant_ref_t) swap =
+ XEN_GUEST_HANDLE_PARAM(gnttab_swap_grant_ref_t) swap =
guest_handle_cast(uop, gnttab_swap_grant_ref_t);
if ( unlikely(!guest_handle_okay(swap, count)) )
goto out;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/kernel.c
--- a/xen/common/kernel.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/kernel.c Wed Oct 17 16:43:53 2012 +0100
@@ -204,7 +204,7 @@ void __init do_initcalls(void)
* Simple hypercalls.
*/
-DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg)
+DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
switch ( cmd )
{
@@ -332,7 +332,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
return -ENOSYS;
}
-DO(nmi_op)(unsigned int cmd, XEN_GUEST_HANDLE(void) arg)
+DO(nmi_op)(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct xennmi_callback cb;
long rc = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/kexec.c
--- a/xen/common/kexec.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/kexec.c Wed Oct 17 16:43:53 2012 +0100
@@ -613,7 +613,7 @@ static int kexec_get_range_internal(xen_
return ret;
}
-static int kexec_get_range(XEN_GUEST_HANDLE(void) uarg)
+static int kexec_get_range(XEN_GUEST_HANDLE_PARAM(void) uarg)
{
xen_kexec_range_t range;
int ret = -EINVAL;
@@ -629,7 +629,7 @@ static int kexec_get_range(XEN_GUEST_HAN
return ret;
}
-static int kexec_get_range_compat(XEN_GUEST_HANDLE(void) uarg)
+static int kexec_get_range_compat(XEN_GUEST_HANDLE_PARAM(void) uarg)
{
#ifdef CONFIG_COMPAT
xen_kexec_range_t range;
@@ -777,7 +777,7 @@ static int kexec_load_unload_internal(un
return ret;
}
-static int kexec_load_unload(unsigned long op, XEN_GUEST_HANDLE(void) uarg)
+static int kexec_load_unload(unsigned long op, XEN_GUEST_HANDLE_PARAM(void)
uarg)
{
xen_kexec_load_t load;
@@ -788,7 +788,7 @@ static int kexec_load_unload(unsigned lo
}
static int kexec_load_unload_compat(unsigned long op,
- XEN_GUEST_HANDLE(void) uarg)
+ XEN_GUEST_HANDLE_PARAM(void) uarg)
{
#ifdef CONFIG_COMPAT
compat_kexec_load_t compat_load;
@@ -813,7 +813,7 @@ static int kexec_load_unload_compat(unsi
#endif /* CONFIG_COMPAT */
}
-static int kexec_exec(XEN_GUEST_HANDLE(void) uarg)
+static int kexec_exec(XEN_GUEST_HANDLE_PARAM(void) uarg)
{
xen_kexec_exec_t exec;
xen_kexec_image_t *image;
@@ -845,7 +845,8 @@ static int kexec_exec(XEN_GUEST_HANDLE(v
return -EINVAL; /* never reached */
}
-static int do_kexec_op_internal(unsigned long op, XEN_GUEST_HANDLE(void) uarg,
+static int do_kexec_op_internal(unsigned long op,
+ XEN_GUEST_HANDLE_PARAM(void) uarg,
bool_t compat)
{
unsigned long flags;
@@ -886,13 +887,13 @@ static int do_kexec_op_internal(unsigned
return ret;
}
-long do_kexec_op(unsigned long op, XEN_GUEST_HANDLE(void) uarg)
+long do_kexec_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg)
{
return do_kexec_op_internal(op, uarg, 0);
}
#ifdef CONFIG_COMPAT
-int compat_kexec_op(unsigned long op, XEN_GUEST_HANDLE(void) uarg)
+int compat_kexec_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg)
{
return do_kexec_op_internal(op, uarg, 1);
}
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/memory.c
--- a/xen/common/memory.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/memory.c Wed Oct 17 16:43:53 2012 +0100
@@ -277,7 +277,7 @@ static void decrease_reservation(struct
a->nr_done = i;
}
-static long memory_exchange(XEN_GUEST_HANDLE(xen_memory_exchange_t) arg)
+static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg)
{
struct xen_memory_exchange exch;
PAGE_LIST_HEAD(in_chunk_list);
@@ -517,7 +517,7 @@ static long memory_exchange(XEN_GUEST_HA
return rc;
}
-long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg)
+long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct domain *d;
int rc, op;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/schedule.c
--- a/xen/common/schedule.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/schedule.c Wed Oct 17 16:43:53 2012 +0100
@@ -836,7 +836,7 @@ typedef long ret_t;
#endif /* !COMPAT */
-ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE(void) arg)
+ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
ret_t ret = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/sysctl.c
--- a/xen/common/sysctl.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/sysctl.c Wed Oct 17 16:43:53 2012 +0100
@@ -27,7 +27,7 @@
#include <xsm/xsm.h>
#include <xen/pmstat.h>
-long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
+long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
{
long ret = 0;
struct xen_sysctl curop, *op = &curop;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/tmem.c
--- a/xen/common/tmem.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/tmem.c Wed Oct 17 16:43:53 2012 +0100
@@ -1444,7 +1444,7 @@ static inline void tmem_ensure_avail_pag
/************ TMEM CORE OPERATIONS ************************************/
static NOINLINE int do_tmem_put_compress(pgp_t *pgp, tmem_cli_mfn_t cmfn,
- tmem_cli_va_t clibuf)
+ tmem_cli_va_param_t clibuf)
{
void *dst, *p;
size_t size;
@@ -1488,7 +1488,7 @@ out:
static NOINLINE int do_tmem_dup_put(pgp_t *pgp, tmem_cli_mfn_t cmfn,
pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len,
- tmem_cli_va_t clibuf)
+ tmem_cli_va_param_t clibuf)
{
pool_t *pool;
obj_t *obj;
@@ -1579,7 +1579,7 @@ cleanup:
static NOINLINE int do_tmem_put(pool_t *pool,
OID *oidp, uint32_t index,
tmem_cli_mfn_t cmfn, pagesize_t tmem_offset,
- pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_t clibuf)
+ pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t
clibuf)
{
obj_t *obj = NULL, *objfound = NULL, *objnew = NULL;
pgp_t *pgp = NULL, *pgpdel = NULL;
@@ -1722,7 +1722,7 @@ free:
static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index,
tmem_cli_mfn_t cmfn, pagesize_t tmem_offset,
- pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_t clibuf)
+ pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t
clibuf)
{
obj_t *obj;
pgp_t *pgp;
@@ -2066,8 +2066,8 @@ static int tmemc_flush_mem(cli_id_t cli_
*/
#define BSIZE 1024
-static int tmemc_list_client(client_t *c, tmem_cli_va_t buf, int off,
- uint32_t len, bool_t use_long)
+static int tmemc_list_client(client_t *c, tmem_cli_va_param_t buf,
+ int off, uint32_t len, bool_t use_long)
{
char info[BSIZE];
int i, n = 0, sum = 0;
@@ -2119,7 +2119,7 @@ static int tmemc_list_client(client_t *c
return sum;
}
-static int tmemc_list_shared(tmem_cli_va_t buf, int off, uint32_t len,
+static int tmemc_list_shared(tmem_cli_va_param_t buf, int off, uint32_t len,
bool_t use_long)
{
char info[BSIZE];
@@ -2159,8 +2159,8 @@ static int tmemc_list_shared(tmem_cli_va
}
#ifdef TMEM_PERF
-static int tmemc_list_global_perf(tmem_cli_va_t buf, int off, uint32_t len,
- bool_t use_long)
+static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off,
+ uint32_t len, bool_t use_long)
{
char info[BSIZE];
int n = 0, sum = 0;
@@ -2194,7 +2194,7 @@ static int tmemc_list_global_perf(tmem_c
#define tmemc_list_global_perf(_buf,_off,_len,_use) (0)
#endif
-static int tmemc_list_global(tmem_cli_va_t buf, int off, uint32_t len,
+static int tmemc_list_global(tmem_cli_va_param_t buf, int off, uint32_t len,
bool_t use_long)
{
char info[BSIZE];
@@ -2226,7 +2226,7 @@ static int tmemc_list_global(tmem_cli_va
return sum;
}
-static int tmemc_list(cli_id_t cli_id, tmem_cli_va_t buf, uint32_t len,
+static int tmemc_list(cli_id_t cli_id, tmem_cli_va_param_t buf, uint32_t len,
bool_t use_long)
{
client_t *client;
@@ -2338,7 +2338,7 @@ static NOINLINE int tmemc_shared_pool_au
}
static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id,
- uint32_t subop, tmem_cli_va_t buf, uint32_t arg1)
+ uint32_t subop, tmem_cli_va_param_t buf, uint32_t arg1)
{
client_t *client = tmh_client_from_cli_id(cli_id);
pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN)
@@ -2427,7 +2427,7 @@ static NOINLINE int tmemc_save_subop(int
}
static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id,
- tmem_cli_va_t buf, uint32_t bufsize)
+ tmem_cli_va_param_t buf, uint32_t bufsize)
{
client_t *client = tmh_client_from_cli_id(cli_id);
pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN)
@@ -2479,7 +2479,7 @@ out:
return ret;
}
-static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_t buf,
+static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t
buf,
uint32_t bufsize)
{
client_t *client = tmh_client_from_cli_id(cli_id);
@@ -2522,7 +2522,7 @@ out:
}
static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp,
- uint32_t index, tmem_cli_va_t buf, uint32_t bufsize)
+ uint32_t index, tmem_cli_va_param_t buf, uint32_t
bufsize)
{
client_t *client = tmh_client_from_cli_id(cli_id);
pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN)
@@ -2566,7 +2566,8 @@ static NOINLINE int do_tmem_control(stru
ret = tmemc_flush_mem(op->u.ctrl.cli_id,op->u.ctrl.arg1);
break;
case TMEMC_LIST:
- ret = tmemc_list(op->u.ctrl.cli_id,op->u.ctrl.buf,
+ ret = tmemc_list(op->u.ctrl.cli_id,
+ guest_handle_cast(op->u.ctrl.buf, char),
op->u.ctrl.arg1,op->u.ctrl.arg2);
break;
case TMEMC_SET_WEIGHT:
@@ -2589,20 +2590,24 @@ static NOINLINE int do_tmem_control(stru
case TMEMC_SAVE_GET_POOL_UUID:
case TMEMC_SAVE_END:
ret = tmemc_save_subop(op->u.ctrl.cli_id,pool_id,subop,
- op->u.ctrl.buf,op->u.ctrl.arg1);
+ guest_handle_cast(op->u.ctrl.buf, char),
+ op->u.ctrl.arg1);
break;
case TMEMC_SAVE_GET_NEXT_PAGE:
ret = tmemc_save_get_next_page(op->u.ctrl.cli_id, pool_id,
- op->u.ctrl.buf, op->u.ctrl.arg1);
+ guest_handle_cast(op->u.ctrl.buf, char),
+ op->u.ctrl.arg1);
break;
case TMEMC_SAVE_GET_NEXT_INV:
- ret = tmemc_save_get_next_inv(op->u.ctrl.cli_id, op->u.ctrl.buf,
+ ret = tmemc_save_get_next_inv(op->u.ctrl.cli_id,
+ guest_handle_cast(op->u.ctrl.buf, char),
op->u.ctrl.arg1);
break;
case TMEMC_RESTORE_PUT_PAGE:
ret = tmemc_restore_put_page(op->u.ctrl.cli_id,pool_id,
oidp, op->u.ctrl.arg2,
- op->u.ctrl.buf, op->u.ctrl.arg1);
+ guest_handle_cast(op->u.ctrl.buf, char),
+ op->u.ctrl.arg1);
break;
case TMEMC_RESTORE_FLUSH_PAGE:
ret = tmemc_restore_flush_page(op->u.ctrl.cli_id,pool_id,
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/tmem_xen.c
--- a/xen/common/tmem_xen.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/tmem_xen.c Wed Oct 17 16:43:53 2012 +0100
@@ -146,7 +146,7 @@ static inline void cli_put_page(void *cl
EXPORT int tmh_copy_from_client(pfp_t *pfp,
tmem_cli_mfn_t cmfn, pagesize_t tmem_offset,
- pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_t clibuf)
+ pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf)
{
unsigned long tmem_mfn, cli_mfn = 0;
char *tmem_va, *cli_va = NULL;
@@ -194,7 +194,7 @@ EXPORT int tmh_copy_from_client(pfp_t *p
}
EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn,
- void **out_va, size_t *out_len, tmem_cli_va_t clibuf)
+ void **out_va, size_t *out_len, tmem_cli_va_param_t clibuf)
{
int ret = 0;
unsigned char *dmem = this_cpu(dstmem);
@@ -227,7 +227,7 @@ EXPORT int tmh_compress_from_client(tmem
EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, pfp_t *pfp,
pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len,
- tmem_cli_va_t clibuf)
+ tmem_cli_va_param_t clibuf)
{
unsigned long tmem_mfn, cli_mfn = 0;
char *tmem_va, *cli_va = NULL;
@@ -265,7 +265,7 @@ EXPORT int tmh_copy_to_client(tmem_cli_m
}
EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va,
- size_t size, tmem_cli_va_t clibuf)
+ size_t size, tmem_cli_va_param_t clibuf)
{
unsigned long cli_mfn = 0;
pfp_t *cli_pfp = NULL;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/common/xenoprof.c
--- a/xen/common/xenoprof.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/common/xenoprof.c Wed Oct 17 16:43:53 2012 +0100
@@ -404,7 +404,7 @@ static int add_active_list(domid_t domid
return 0;
}
-static int add_passive_list(XEN_GUEST_HANDLE(void) arg)
+static int add_passive_list(XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct xenoprof_passive passive;
struct domain *d;
@@ -585,7 +585,7 @@ void xenoprof_log_event(struct vcpu *vcp
-static int xenoprof_op_init(XEN_GUEST_HANDLE(void) arg)
+static int xenoprof_op_init(XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct domain *d = current->domain;
struct xenoprof_init xenoprof_init;
@@ -611,7 +611,7 @@ static int xenoprof_op_init(XEN_GUEST_HA
#endif /* !COMPAT */
-static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE(void) arg)
+static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct xenoprof_get_buffer xenoprof_get_buffer;
struct domain *d = current->domain;
@@ -662,7 +662,7 @@ static int xenoprof_op_get_buffer(XEN_GU
|| (op == XENOPROF_disable_virq) \
|| (op == XENOPROF_get_buffer))
-ret_t do_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg)
+ret_t do_xenoprof_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
int ret = 0;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/drivers/acpi/pmstat.c
--- a/xen/drivers/acpi/pmstat.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/drivers/acpi/pmstat.c Wed Oct 17 16:43:53 2012 +0100
@@ -496,7 +496,7 @@ int do_pm_op(struct xen_sysctl_pm_op *op
return ret;
}
-int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE(uint32) pdc)
+int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE_PARAM(uint32) pdc)
{
u32 bits[3];
int ret;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/drivers/char/console.c
--- a/xen/drivers/char/console.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/drivers/char/console.c Wed Oct 17 16:43:53 2012 +0100
@@ -182,7 +182,7 @@ static void putchar_console_ring(int c)
long read_console_ring(struct xen_sysctl_readconsole *op)
{
- XEN_GUEST_HANDLE(char) str;
+ XEN_GUEST_HANDLE_PARAM(char) str;
uint32_t idx, len, max, sofar, c;
str = guest_handle_cast(op->buffer, char),
@@ -363,7 +363,7 @@ static void notify_dom0_con_ring(unsigne
static DECLARE_SOFTIRQ_TASKLET(notify_dom0_con_ring_tasklet,
notify_dom0_con_ring, 0);
-static long guest_console_write(XEN_GUEST_HANDLE(char) buffer, int count)
+static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count)
{
char kbuf[128], *kptr;
int kcount;
@@ -401,7 +401,7 @@ static long guest_console_write(XEN_GUES
return 0;
}
-long do_console_io(int cmd, int count, XEN_GUEST_HANDLE(char) buffer)
+long do_console_io(int cmd, int count, XEN_GUEST_HANDLE_PARAM(char) buffer)
{
long rc;
unsigned int idx, len;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/drivers/passthrough/iommu.c
--- a/xen/drivers/passthrough/iommu.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/drivers/passthrough/iommu.c Wed Oct 17 16:43:53 2012 +0100
@@ -527,7 +527,7 @@ void iommu_crash_shutdown(void)
int iommu_do_domctl(
struct xen_domctl *domctl,
- XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
+ XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
{
struct domain *d;
u16 seg;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-arm/hypercall.h
--- a/xen/include/asm-arm/hypercall.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-arm/hypercall.h Wed Oct 17 16:43:53 2012 +0100
@@ -2,7 +2,7 @@
#define __ASM_ARM_HYPERCALL_H__
#include <public/domctl.h> /* for arch_do_domctl */
-int do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg);
+int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg);
#endif /* __ASM_ARM_HYPERCALL_H__ */
/*
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-arm/mm.h
--- a/xen/include/asm-arm/mm.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-arm/mm.h Wed Oct 17 16:43:53 2012 +0100
@@ -267,7 +267,7 @@ static inline int relinquish_shared_page
/* Arch-specific portion of memory_op hypercall. */
-long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg);
+long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg);
int steal_page(
struct domain *d, struct page_info *page, unsigned int memflags);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/hap.h
--- a/xen/include/asm-x86/hap.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/hap.h Wed Oct 17 16:43:53 2012 +0100
@@ -51,7 +51,7 @@ hap_unmap_domain_page(void *p)
/************************************************/
void hap_domain_init(struct domain *d);
int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
- XEN_GUEST_HANDLE(void) u_domctl);
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl);
int hap_enable(struct domain *d, u32 mode);
void hap_final_teardown(struct domain *d);
void hap_teardown(struct domain *d);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/hypercall.h
--- a/xen/include/asm-x86/hypercall.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/hypercall.h Wed Oct 17 16:43:53 2012 +0100
@@ -18,22 +18,22 @@
extern long
do_event_channel_op_compat(
- XEN_GUEST_HANDLE(evtchn_op_t) uop);
+ XEN_GUEST_HANDLE_PARAM(evtchn_op_t) uop);
extern long
do_set_trap_table(
- XEN_GUEST_HANDLE(const_trap_info_t) traps);
+ XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps);
extern long
do_mmu_update(
- XEN_GUEST_HANDLE(mmu_update_t) ureqs,
+ XEN_GUEST_HANDLE_PARAM(mmu_update_t) ureqs,
unsigned int count,
- XEN_GUEST_HANDLE(uint) pdone,
+ XEN_GUEST_HANDLE_PARAM(uint) pdone,
unsigned int foreigndom);
extern long
do_set_gdt(
- XEN_GUEST_HANDLE(ulong) frame_list,
+ XEN_GUEST_HANDLE_PARAM(ulong) frame_list,
unsigned int entries);
extern long
@@ -60,7 +60,7 @@ do_update_descriptor(
u64 desc);
extern long
-do_mca(XEN_GUEST_HANDLE(xen_mc_t) u_xen_mc);
+do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc);
extern long
do_update_va_mapping(
@@ -70,7 +70,7 @@ do_update_va_mapping(
extern long
do_physdev_op(
- int cmd, XEN_GUEST_HANDLE(void) arg);
+ int cmd, XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_update_va_mapping_otherdomain(
@@ -81,9 +81,9 @@ do_update_va_mapping_otherdomain(
extern long
do_mmuext_op(
- XEN_GUEST_HANDLE(mmuext_op_t) uops,
+ XEN_GUEST_HANDLE_PARAM(mmuext_op_t) uops,
unsigned int count,
- XEN_GUEST_HANDLE(uint) pdone,
+ XEN_GUEST_HANDLE_PARAM(uint) pdone,
unsigned int foreigndom);
extern unsigned long
@@ -104,10 +104,10 @@ do_set_segment_base(
extern int
compat_physdev_op(
int cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern int
arch_compat_vcpu_op(
- int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg);
+ int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg);
#endif /* __ASM_X86_HYPERCALL_H__ */
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/mem_event.h
--- a/xen/include/asm-x86/mem_event.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/mem_event.h Wed Oct 17 16:43:53 2012 +0100
@@ -65,7 +65,7 @@ int mem_event_get_response(struct domain
struct domain *get_mem_event_op_target(uint32_t domain, int *rc);
int do_mem_event_op(int op, uint32_t domain, void *arg);
int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec,
- XEN_GUEST_HANDLE(void) u_domctl);
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl);
#endif /* __MEM_EVENT_H__ */
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/mm.h Wed Oct 17 16:43:53 2012 +0100
@@ -555,10 +555,10 @@ void *do_page_walk(struct vcpu *v, unsig
int __sync_local_execstate(void);
/* Arch-specific portion of memory_op hypercall. */
-long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg);
-long subarch_memory_op(int op, XEN_GUEST_HANDLE(void) arg);
-int compat_arch_memory_op(int op, XEN_GUEST_HANDLE(void));
-int compat_subarch_memory_op(int op, XEN_GUEST_HANDLE(void));
+long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg);
+long subarch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg);
+int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void));
+int compat_subarch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void));
int steal_page(
struct domain *d, struct page_info *page, unsigned int memflags);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/paging.h
--- a/xen/include/asm-x86/paging.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/paging.h Wed Oct 17 16:43:53 2012 +0100
@@ -207,7 +207,7 @@ int paging_domain_init(struct domain *d,
* and disable ephemeral shadow modes (test mode and log-dirty mode) and
* manipulate the log-dirty bitmap. */
int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
- XEN_GUEST_HANDLE(void) u_domctl);
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl);
/* Call when destroying a domain */
void paging_teardown(struct domain *d);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/processor.h
--- a/xen/include/asm-x86/processor.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/processor.h Wed Oct 17 16:43:53 2012 +0100
@@ -549,7 +549,7 @@ int rdmsr_hypervisor_regs(uint32_t idx,
int wrmsr_hypervisor_regs(uint32_t idx, uint64_t val);
void microcode_set_module(unsigned int);
-int microcode_update(XEN_GUEST_HANDLE(const_void), unsigned long len);
+int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len);
int microcode_resume_cpu(int cpu);
#endif /* !__ASSEMBLY__ */
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/shadow.h Wed Oct 17 16:43:53 2012 +0100
@@ -73,7 +73,7 @@ int shadow_track_dirty_vram(struct domai
* manipulate the log-dirty bitmap. */
int shadow_domctl(struct domain *d,
xen_domctl_shadow_op_t *sc,
- XEN_GUEST_HANDLE(void) u_domctl);
+ XEN_GUEST_HANDLE_PARAM(void) u_domctl);
/* Call when destroying a domain */
void shadow_teardown(struct domain *d);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/asm-x86/xenoprof.h
--- a/xen/include/asm-x86/xenoprof.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/asm-x86/xenoprof.h Wed Oct 17 16:43:53 2012 +0100
@@ -40,9 +40,9 @@ int xenoprof_arch_init(int *num_events,
#define xenoprof_arch_disable_virq() nmi_disable_virq()
#define xenoprof_arch_release_counters() nmi_release_counters()
-int xenoprof_arch_counter(XEN_GUEST_HANDLE(void) arg);
-int compat_oprof_arch_counter(XEN_GUEST_HANDLE(void) arg);
-int xenoprof_arch_ibs_counter(XEN_GUEST_HANDLE(void) arg);
+int xenoprof_arch_counter(XEN_GUEST_HANDLE_PARAM(void) arg);
+int compat_oprof_arch_counter(XEN_GUEST_HANDLE_PARAM(void) arg);
+int xenoprof_arch_ibs_counter(XEN_GUEST_HANDLE_PARAM(void) arg);
struct vcpu;
struct cpu_user_regs;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/xen/acpi.h
--- a/xen/include/xen/acpi.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/xen/acpi.h Wed Oct 17 16:43:53 2012 +0100
@@ -145,8 +145,8 @@ static inline unsigned int acpi_get_csta
static inline void acpi_set_cstate_limit(unsigned int new_limit) { return; }
#endif
-#ifdef XEN_GUEST_HANDLE
-int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE(uint32));
+#ifdef XEN_GUEST_HANDLE_PARAM
+int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE_PARAM(uint32));
#endif
int arch_acpi_set_pdc_bits(u32 acpi_id, u32 *, u32 mask);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/xen/compat.h
--- a/xen/include/xen/compat.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/xen/compat.h Wed Oct 17 16:43:53 2012 +0100
@@ -22,6 +22,9 @@
__DEFINE_COMPAT_HANDLE(const_ ## name, const name)
#define COMPAT_HANDLE(name) __compat_handle_ ## name
+/* NB: it is assumed that if an arch uses the compat layer it does not
+ * distinguish handles from parameter handles. */
+#define COMPAT_HANDLE_PARAM(name) __compat_handle_ ## name
/* Is the compat handle a NULL reference? */
#define compat_handle_is_null(hnd) ((hnd).c == 0)
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/xen/hypercall.h
--- a/xen/include/xen/hypercall.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/xen/hypercall.h Wed Oct 17 16:43:53 2012 +0100
@@ -29,29 +29,29 @@ do_sched_op_compat(
extern long
do_sched_op(
int cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_domctl(
- XEN_GUEST_HANDLE(xen_domctl_t) u_domctl);
+ XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl);
extern long
arch_do_domctl(
struct xen_domctl *domctl,
- XEN_GUEST_HANDLE(xen_domctl_t) u_domctl);
+ XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl);
extern long
do_sysctl(
- XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
+ XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl);
extern long
arch_do_sysctl(
struct xen_sysctl *sysctl,
- XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
+ XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl);
extern long
do_platform_op(
- XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op);
+ XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op);
/*
* To allow safe resume of do_memory_op() after preemption, we need to know
@@ -64,11 +64,11 @@ do_platform_op(
extern long
do_memory_op(
unsigned long cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_multicall(
- XEN_GUEST_HANDLE(multicall_entry_t) call_list,
+ XEN_GUEST_HANDLE_PARAM(multicall_entry_t) call_list,
unsigned int nr_calls);
extern long
@@ -77,23 +77,23 @@ do_set_timer_op(
extern long
do_event_channel_op(
- int cmd, XEN_GUEST_HANDLE(void) arg);
+ int cmd, XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_xen_version(
int cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_console_io(
int cmd,
int count,
- XEN_GUEST_HANDLE(char) buffer);
+ XEN_GUEST_HANDLE_PARAM(char) buffer);
extern long
do_grant_table_op(
unsigned int cmd,
- XEN_GUEST_HANDLE(void) uop,
+ XEN_GUEST_HANDLE_PARAM(void) uop,
unsigned int count);
extern long
@@ -105,72 +105,72 @@ extern long
do_vcpu_op(
int cmd,
int vcpuid,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
struct vcpu;
extern long
arch_do_vcpu_op(int cmd,
struct vcpu *v,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_nmi_op(
unsigned int cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_hvm_op(
unsigned long op,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_kexec_op(
unsigned long op,
int arg1,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_xsm_op(
- XEN_GUEST_HANDLE(xsm_op_t) u_xsm_op);
+ XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_xsm_op);
extern long
do_tmem_op(
- XEN_GUEST_HANDLE(tmem_op_t) uops);
+ XEN_GUEST_HANDLE_PARAM(tmem_op_t) uops);
extern long
-do_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg);
+do_xenoprof_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg);
#ifdef CONFIG_COMPAT
extern int
compat_memory_op(
unsigned int cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern int
compat_grant_table_op(
unsigned int cmd,
- XEN_GUEST_HANDLE(void) uop,
+ XEN_GUEST_HANDLE_PARAM(void) uop,
unsigned int count);
extern int
compat_vcpu_op(
int cmd,
int vcpuid,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern int
-compat_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg);
+compat_xenoprof_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg);
extern int
compat_xen_version(
int cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern int
compat_sched_op(
int cmd,
- XEN_GUEST_HANDLE(void) arg);
+ XEN_GUEST_HANDLE_PARAM(void) arg);
extern int
compat_set_timer_op(
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/xen/iommu.h Wed Oct 17 16:43:53 2012 +0100
@@ -130,7 +130,7 @@ void iommu_crash_shutdown(void);
void iommu_set_dom0_mapping(struct domain *d);
void iommu_share_p2m_table(struct domain *d);
-int iommu_do_domctl(struct xen_domctl *, XEN_GUEST_HANDLE(xen_domctl_t));
+int iommu_do_domctl(struct xen_domctl *, XEN_GUEST_HANDLE_PARAM(xen_domctl_t));
void iommu_iotlb_flush(struct domain *d, unsigned long gfn, unsigned int
page_count);
void iommu_iotlb_flush_all(struct domain *d);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/xen/tmem_xen.h
--- a/xen/include/xen/tmem_xen.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/xen/tmem_xen.h Wed Oct 17 16:43:53 2012 +0100
@@ -430,7 +430,8 @@ static inline void tmh_tze_copy_from_pfp
typedef XEN_GUEST_HANDLE(void) cli_mfn_t;
typedef XEN_GUEST_HANDLE(char) cli_va_t;
*/
-typedef XEN_GUEST_HANDLE(tmem_op_t) tmem_cli_op_t;
+typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t;
+typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t;
static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops)
{
@@ -466,8 +467,9 @@ static inline int tmh_get_tmemop_from_cl
#define tmh_cli_buf_null guest_handle_from_ptr(NULL, char)
-static inline void tmh_copy_to_client_buf_offset(tmem_cli_va_t clibuf, int off,
- char *tmembuf, int len)
+static inline void tmh_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf,
+ int off,
+ char *tmembuf, int len)
{
copy_to_guest_offset(clibuf,off,tmembuf,len);
}
@@ -482,15 +484,17 @@ static inline void tmh_copy_to_client_bu
#define tmh_cli_id_str "domid"
#define tmh_client_str "domain"
-int tmh_decompress_to_client(tmem_cli_mfn_t, void *, size_t, tmem_cli_va_t);
+int tmh_decompress_to_client(tmem_cli_mfn_t, void *, size_t,
+ tmem_cli_va_param_t);
-int tmh_compress_from_client(tmem_cli_mfn_t, void **, size_t *, tmem_cli_va_t);
+int tmh_compress_from_client(tmem_cli_mfn_t, void **, size_t *,
+ tmem_cli_va_param_t);
int tmh_copy_from_client(pfp_t *, tmem_cli_mfn_t, pagesize_t tmem_offset,
- pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_t);
+ pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t);
int tmh_copy_to_client(tmem_cli_mfn_t, pfp_t *, pagesize_t tmem_offset,
- pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_t);
+ pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t);
extern int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va,
pagesize_t len);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/include/xsm/xsm.h
--- a/xen/include/xsm/xsm.h Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/include/xsm/xsm.h Wed Oct 17 16:43:53 2012 +0100
@@ -139,7 +139,7 @@ struct xsm_operations {
int (*cpupool_op)(void);
int (*sched_op)(void);
- long (*__do_xsm_op) (XEN_GUEST_HANDLE(xsm_op_t) op);
+ long (*__do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op);
#ifdef CONFIG_X86
int (*shadow_control) (struct domain *d, uint32_t op);
@@ -585,7 +585,7 @@ static inline int xsm_sched_op(void)
return xsm_call(sched_op());
}
-static inline long __do_xsm_op (XEN_GUEST_HANDLE(xsm_op_t) op)
+static inline long __do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op)
{
#ifdef XSM_ENABLE
return xsm_ops->__do_xsm_op(op);
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/xsm/dummy.c
--- a/xen/xsm/dummy.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/xsm/dummy.c Wed Oct 17 16:43:53 2012 +0100
@@ -380,7 +380,7 @@ static int dummy_sched_op (void)
return 0;
}
-static long dummy___do_xsm_op(XEN_GUEST_HANDLE(xsm_op_t) op)
+static long dummy___do_xsm_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op)
{
return -ENOSYS;
}
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/xsm/flask/flask_op.c
--- a/xen/xsm/flask/flask_op.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/xsm/flask/flask_op.c Wed Oct 17 16:43:53 2012 +0100
@@ -71,7 +71,7 @@ static int domain_has_security(struct do
perms, NULL);
}
-static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf,
uint32_t size)
+static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf,
uint32_t size)
{
char *tmp = xmalloc_bytes(size + 1);
if ( !tmp )
@@ -618,7 +618,7 @@ static int flask_relabel_domain(struct x
return rc;
}
-long do_flask_op(XEN_GUEST_HANDLE(xsm_op_t) u_flask_op)
+long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op)
{
xen_flask_op_t op;
int rv;
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/xsm/flask/hooks.c
--- a/xen/xsm/flask/hooks.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/xsm/flask/hooks.c Wed Oct 17 16:43:53 2012 +0100
@@ -1462,7 +1462,7 @@ static int flask_vcpuextstate (struct do
}
#endif
-long do_flask_op(XEN_GUEST_HANDLE(xsm_op_t) u_flask_op);
+long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op);
static struct xsm_operations flask_ops = {
.security_domaininfo = flask_security_domaininfo,
diff -r 1eb4b2f7465f -r 9eafdcd5ff0b xen/xsm/xsm_core.c
--- a/xen/xsm/xsm_core.c Wed Oct 17 16:43:51 2012 +0100
+++ b/xen/xsm/xsm_core.c Wed Oct 17 16:43:53 2012 +0100
@@ -111,7 +111,7 @@ int unregister_xsm(struct xsm_operations
#endif
-long do_xsm_op (XEN_GUEST_HANDLE(xsm_op_t) op)
+long do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op)
{
return __do_xsm_op(op);
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |