From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: keir@xen.org,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
tim@xen.org, JBeulich@suse.com, stefano.stabelini@citrix.com
Subject: [PATCH 21/21] xen: more substitutions
Date: Fri, 5 Oct 2012 10:38:27 +0000 [thread overview]
Message-ID: <1349433507-21148-21-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1349433418.20946.46.camel@zakaz.uk.xensource.com>
From: Stefano Stabellini <stefano.stabellini@eu.citrix.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>
Cc: keir@xen.org
Cc: JBeulich@suse.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 9a828de..f9a41fd 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -2913,7 +2913,9 @@ long 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;
@@ -4195,6 +4197,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 )
@@ -4202,7 +4205,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++;
@@ -4499,6 +4503,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) )
@@ -4513,7 +4518,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 433f881..6924385 100644
--- a/xen/arch/x86/oprofile/backtrace.c
+++ b/xen/arch/x86/oprofile/backtrace.c
@@ -74,8 +74,10 @@ dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head,
}
else
{
- 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 7a7325f..a3b5a6b 100644
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -186,7 +186,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;
@@ -454,7 +456,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 e7e2a40..3219d3c 100644
--- a/xen/common/compat/multicall.c
+++ b/xen/common/compat/multicall.c
@@ -25,6 +25,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)
static void __trace_multicall_call(multicall_entry_t *call)
{
--
1.7.9.1
next prev parent reply other threads:[~2012-10-05 10:38 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 10:36 [PATCH 00/21] Sweep through arm-for-4.3 branch + a bit extra Ian Campbell
2012-10-05 10:38 ` [PATCH 01/21] xen: arm: implement XENMEM_add_to_physmap_range Ian Campbell
2012-10-08 13:42 ` Ian Campbell
2012-10-05 10:38 ` [PATCH 02/21] libxc: add ARM support to xc_dom (PV domain building) Ian Campbell
2012-10-05 10:38 ` [PATCH 03/21] arm: implement VGCF_online Ian Campbell
2012-10-05 10:38 ` [PATCH 04/21] xen/arm: implement page reference and gnttab functions needed by grant_table.c Ian Campbell
2012-10-05 10:38 ` [PATCH 05/21] xen/arm: implement get/put_page_type Ian Campbell
2012-10-05 10:38 ` [PATCH 06/21] xen/arm: create_p2m_entries should not call free_domheap_page Ian Campbell
2012-10-05 10:38 ` [PATCH 07/21] xen/arm: grant table Ian Campbell
2012-10-05 10:38 ` [PATCH 08/21] arm: kill a guest which uses hvc with an immediate operand != XEN_HYPERCALL_TAG Ian Campbell
2012-10-05 10:38 ` [PATCH 09/21] libxc/arm: allocate xenstore and console pages Ian Campbell
2012-10-05 10:38 ` [PATCH 10/21] arm: disable distributor delivery on boot CPU only Ian Campbell
2012-10-05 10:38 ` [PATCH 11/21] xen/arm: protect LR registers and lr_mask changes with spin_lock_irq Ian Campbell
2012-10-05 10:38 ` [PATCH 12/21] xen/arm: introduce __lshrdi3 and __aeabi_llsr Ian Campbell
2012-10-05 10:38 ` [PATCH 13/21] arm: don't bother setting up vtimer, vgic etc on idle CPUs Ian Campbell
2012-10-05 10:38 ` [PATCH 14/21] arm/vtimer: convert result to ticks when reading CNTPCT register Ian Campbell
2012-10-05 10:38 ` [PATCH 15/21] arm: Use per-CPU irq_desc for PPIs and SGIs Ian Campbell
2012-10-05 10:38 ` [PATCH 16/21] arm: tools: add arm to foreign structs checking Ian Campbell
2012-10-05 10:38 ` [PATCH 17/21] xen: xen_ulong_t substitution Ian Campbell
2012-10-05 11:00 ` Jan Beulich
2012-10-05 11:03 ` Ian Campbell
2012-10-05 14:13 ` Stefano Stabellini
2012-10-08 13:45 ` Ian Campbell
2012-10-05 16:08 ` Ian Campbell
2012-10-09 12:39 ` Stefano Stabellini
2012-10-09 12:49 ` Ian Campbell
2012-10-09 12:51 ` Stefano Stabellini
2012-10-09 13:05 ` Ian Campbell
2012-10-05 10:38 ` [PATCH 18/21] xen: change the limit of nr_extents to UINT_MAX >> MEMOP_EXTENT_SHIFT Ian Campbell
2012-10-05 11:02 ` Jan Beulich
2012-10-05 11:05 ` Ian Campbell
2012-10-05 10:38 ` [PATCH 19/21] xen: introduce XEN_GUEST_HANDLE_PARAM Ian Campbell
2012-10-05 11:05 ` Jan Beulich
2012-10-05 11:09 ` Ian Campbell
2012-10-05 11:20 ` Jan Beulich
2012-10-05 11:24 ` Ian Campbell
2012-10-05 10:38 ` [PATCH 20/21] xen: replace XEN_GUEST_HANDLE with XEN_GUEST_HANDLE_PARAM when appropriate Ian Campbell
2012-10-05 11:06 ` Jan Beulich
2012-10-05 14:15 ` Stefano Stabellini
2012-10-05 11:30 ` Ian Campbell
2012-10-05 11:43 ` Jan Beulich
2012-10-05 12:12 ` Ian Campbell
2012-10-05 12:28 ` Jan Beulich
2012-10-05 10:38 ` Ian Campbell [this message]
2012-10-05 11:09 ` [PATCH 21/21] xen: more substitutions Jan Beulich
2012-10-05 11:14 ` Ian Campbell
2012-10-05 11:33 ` Jan Beulich
2012-10-05 11:40 ` Ian Campbell
2012-10-05 11:52 ` Jan Beulich
2012-10-05 11:29 ` Jan Beulich
2012-10-05 14:51 ` Stefano Stabellini
2012-10-09 14:06 ` [PATCH 00/21] Sweep through arm-for-4.3 branch + a bit extra Ian Campbell
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=1349433507-21148-21-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=JBeulich@suse.com \
--cc=keir@xen.org \
--cc=stefano.stabelini@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.org \
/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).