From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: tim@xen.org, Ian.Campbell@citrix.com,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH v3 6/6] xen: more substitutions
Date: Thu, 16 Aug 2012 15:50:12 +0100 [thread overview]
Message-ID: <1345128612-10323-6-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1208161523420.4850@kaball.uk.xensource.com>
More substitutions in this patch, not as obvious as the ones in the
previous patch.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
xen/arch/x86/mm.c | 12 +++++++++---
xen/arch/x86/oprofile/backtrace.c | 4 +++-
xen/arch/x86/platform_hypercall.c | 8 ++++++--
xen/arch/x86/x86_64/cpu_idle.c | 4 +++-
xen/arch/x86/x86_64/cpufreq.c | 4 +++-
xen/arch/x86/x86_64/platform_hypercall.c | 1 +
xen/common/compat/multicall.c | 1 +
7 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 4d72700..088db11 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -3198,7 +3198,9 @@ int do_mmuext_op(
{
cpumask_t pmask;
- if ( unlikely(vcpumask_to_pcpumask(d, op.arg2.vcpumask, &pmask)) )
+ if ( unlikely(vcpumask_to_pcpumask(d,
+ guest_handle_to_param(op.arg2.vcpumask, const_void),
+ &pmask)) )
{
okay = 0;
break;
@@ -4484,6 +4486,7 @@ static int handle_iomem_range(unsigned long s, unsigned long e, void *p)
if ( s > ctxt->s )
{
e820entry_t ent;
+ XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer_t;
XEN_GUEST_HANDLE(e820entry_t) buffer;
if ( ctxt->n + 1 >= ctxt->map.nr_entries )
@@ -4491,7 +4494,8 @@ static int handle_iomem_range(unsigned long s, unsigned long e, void *p)
ent.addr = (uint64_t)ctxt->s << PAGE_SHIFT;
ent.size = (uint64_t)(s - ctxt->s) << PAGE_SHIFT;
ent.type = E820_RESERVED;
- buffer = guest_handle_cast(ctxt->map.buffer, e820entry_t);
+ buffer_t = guest_handle_cast(ctxt->map.buffer, e820entry_t);
+ buffer = guest_handle_from_param(buffer_t, e820entry_t);
if ( __copy_to_guest_offset(buffer, ctxt->n, &ent, 1) )
return -EFAULT;
ctxt->n++;
@@ -4790,6 +4794,7 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct memory_map_context ctxt;
XEN_GUEST_HANDLE(e820entry_t) buffer;
+ XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer_t;
unsigned int i;
if ( !IS_PRIV(current->domain) )
@@ -4804,7 +4809,8 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
if ( ctxt.map.nr_entries < e820.nr_map + 1 )
return -EINVAL;
- buffer = guest_handle_cast(ctxt.map.buffer, e820entry_t);
+ buffer_t = guest_handle_cast(ctxt.map.buffer, e820entry_t);
+ buffer = guest_handle_from_param(buffer_t, e820entry_t);
if ( !guest_handle_okay(buffer, ctxt.map.nr_entries) )
return -EFAULT;
diff --git a/xen/arch/x86/oprofile/backtrace.c b/xen/arch/x86/oprofile/backtrace.c
index 33fd142..699cd28 100644
--- a/xen/arch/x86/oprofile/backtrace.c
+++ b/xen/arch/x86/oprofile/backtrace.c
@@ -80,8 +80,10 @@ dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head,
else
#endif
{
- XEN_GUEST_HANDLE(const_frame_head_t) guest_head =
+ XEN_GUEST_HANDLE(const_frame_head_t) guest_head;
+ XEN_GUEST_HANDLE_PARAM(const_frame_head_t) guest_head_t =
const_guest_handle_from_ptr(head, frame_head_t);
+ guest_head = guest_handle_from_param(guest_head_t, const_frame_head_t);
/* Also check accessibility of one struct frame_head beyond */
if (!guest_handle_okay(guest_head, 2))
diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c
index a32e0a2..2994b12 100644
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -185,7 +185,9 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op)
}
}
- ret = microcode_update(data, op->u.microcode.length);
+ ret = microcode_update(
+ guest_handle_to_param(data, const_void),
+ op->u.microcode.length);
spin_unlock(&vcpu_alloc_lock);
}
break;
@@ -448,7 +450,9 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op)
XEN_GUEST_HANDLE(uint32) pdc;
guest_from_compat_handle(pdc, op->u.set_pminfo.u.pdc);
- ret = acpi_set_pdc_bits(op->u.set_pminfo.id, pdc);
+ ret = acpi_set_pdc_bits(
+ op->u.set_pminfo.id,
+ guest_handle_to_param(pdc, uint32));
}
break;
diff --git a/xen/arch/x86/x86_64/cpu_idle.c b/xen/arch/x86/x86_64/cpu_idle.c
index 3e7422f..1cdaf96 100644
--- a/xen/arch/x86/x86_64/cpu_idle.c
+++ b/xen/arch/x86/x86_64/cpu_idle.c
@@ -57,10 +57,12 @@ static int copy_from_compat_state(xen_processor_cx_t *xen_state,
{
#define XLAT_processor_cx_HNDL_dp(_d_, _s_) do { \
XEN_GUEST_HANDLE(compat_processor_csd_t) dps; \
+ XEN_GUEST_HANDLE_PARAM(xen_processor_csd_t) dps_t; \
if ( unlikely(!compat_handle_okay((_s_)->dp, (_s_)->dpcnt)) ) \
return -EFAULT; \
guest_from_compat_handle(dps, (_s_)->dp); \
- (_d_)->dp = guest_handle_cast(dps, xen_processor_csd_t); \
+ dps_t = guest_handle_cast(dps, xen_processor_csd_t); \
+ (_d_)->dp = guest_handle_from_param(dps_t, xen_processor_csd_t); \
} while (0)
XLAT_processor_cx(xen_state, state);
#undef XLAT_processor_cx_HNDL_dp
diff --git a/xen/arch/x86/x86_64/cpufreq.c b/xen/arch/x86/x86_64/cpufreq.c
index ce9864e..1956777 100644
--- a/xen/arch/x86/x86_64/cpufreq.c
+++ b/xen/arch/x86/x86_64/cpufreq.c
@@ -45,10 +45,12 @@ compat_set_px_pminfo(uint32_t cpu, struct compat_processor_performance *perf)
#define XLAT_processor_performance_HNDL_states(_d_, _s_) do { \
XEN_GUEST_HANDLE(compat_processor_px_t) states; \
+ XEN_GUEST_HANDLE_PARAM(xen_processor_px_t) states_t; \
if ( unlikely(!compat_handle_okay((_s_)->states, (_s_)->state_count)) ) \
return -EFAULT; \
guest_from_compat_handle(states, (_s_)->states); \
- (_d_)->states = guest_handle_cast(states, xen_processor_px_t); \
+ states_t = guest_handle_cast(states, xen_processor_px_t); \
+ (_d_)->states = guest_handle_from_param(states_t, xen_processor_px_t); \
} while (0)
XLAT_processor_performance(xen_perf, perf);
diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c
index 188aa37..f577761 100644
--- a/xen/arch/x86/x86_64/platform_hypercall.c
+++ b/xen/arch/x86/x86_64/platform_hypercall.c
@@ -38,6 +38,7 @@ CHECK_pf_pcpu_version;
#define COMPAT
#define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t)
+#define _XEN_GUEST_HANDLE_PARAM(t) XEN_GUEST_HANDLE(t)
typedef int ret_t;
#include "../platform_hypercall.c"
diff --git a/xen/common/compat/multicall.c b/xen/common/compat/multicall.c
index 0eb1212..72db213 100644
--- a/xen/common/compat/multicall.c
+++ b/xen/common/compat/multicall.c
@@ -24,6 +24,7 @@ DEFINE_XEN_GUEST_HANDLE(multicall_entry_compat_t);
#define call compat_call
#define do_multicall(l, n) compat_multicall(_##l, n)
#define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t)
+#define _XEN_GUEST_HANDLE_PARAM(t) XEN_GUEST_HANDLE(t)
#include "../multicall.c"
--
1.7.2.5
next prev parent reply other threads:[~2012-08-16 14:50 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 14:48 [PATCH v3 0/6] ARM hypercall ABI: 64 bit ready Stefano Stabellini
2012-08-16 14:50 ` [PATCH v3 1/6] xen: improve changes to xen_add_to_physmap Stefano Stabellini
2012-08-16 14:50 ` [PATCH v3 2/6] xen: xen_ulong_t substitution Stefano Stabellini
2012-08-16 14:50 ` [PATCH v3 3/6] xen: change the limit of nr_extents to UINT_MAX >> MEMOP_EXTENT_SHIFT Stefano Stabellini
2012-08-16 14:50 ` [PATCH v3 4/6] xen: introduce XEN_GUEST_HANDLE_PARAM Stefano Stabellini
2012-08-16 15:54 ` Jan Beulich
2012-08-16 16:11 ` Jan Beulich
2012-08-16 17:10 ` Stefano Stabellini
2012-08-17 8:02 ` Ian Campbell
2012-08-17 9:46 ` Jan Beulich
2012-08-17 13:47 ` Stefano Stabellini
2012-08-17 13:51 ` Ian Campbell
2012-08-17 13:55 ` Stefano Stabellini
2012-08-17 14:05 ` Jan Beulich
2012-08-17 13:58 ` Jan Beulich
2012-08-17 14:45 ` Stefano Stabellini
2012-08-17 14:59 ` Jan Beulich
2012-08-17 14:50 ` Ian Campbell
2012-08-17 14:53 ` Stefano Stabellini
2012-08-17 14:57 ` Jan Beulich
2012-08-17 15:06 ` Ian Campbell
2012-08-16 17:08 ` Stefano Stabellini
2012-08-17 9:17 ` Jan Beulich
2012-08-17 13:51 ` Stefano Stabellini
2012-08-16 14:50 ` [PATCH v3 5/6] xen: replace XEN_GUEST_HANDLE with XEN_GUEST_HANDLE_PARAM when appropriate Stefano Stabellini
2012-08-16 14:50 ` Stefano Stabellini [this message]
2012-10-16 10:36 ` [PATCH v3 0/6] ARM hypercall ABI: 64 bit ready Ian Campbell
2012-10-17 16:51 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345128612-10323-6-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).