# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1231125103 -32400
# Node ID ad300e728982b78ed0169f1ecbd888856aa53abc
# Parent d5c2e97b87acdb350aa2c2b8e4d6f0b16658cdc2
[IA64] clean up of xcom_hcall.c.
make xencommize_xxx() calling convention consistent.
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
arch/ia64/xen/xcom_hcall.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff -r d5c2e97b87ac -r ad300e728982 arch/ia64/xen/xcom_hcall.c
--- a/arch/ia64/xen/xcom_hcall.c Mon Jan 05 11:32:31 2009 +0900
+++ b/arch/ia64/xen/xcom_hcall.c Mon Jan 05 12:11:43 2009 +0900
@@ -86,7 +86,7 @@ xencomm_hypercall_event_channel_op(int c
{
int rc;
struct xencomm_handle *desc;
- XENCOMM_MINI_ALIGNED(xc_area, 2);
+ XENCOMM_MINI_ALIGNED(xc_area, 1);
rc = xencommize_event_channel_op(&xc_area, op, &desc);
if (rc)
@@ -187,7 +187,7 @@ xencomm_hypercall_physdev_op(int cmd, vo
{
int rc;
struct xencomm_handle *desc;
- XENCOMM_MINI_ALIGNED(xc_area, 2);
+ XENCOMM_MINI_ALIGNED(xc_area, 1);
rc = xencommize_physdev_op(&xc_area, cmd, op, &desc);
if (rc)
@@ -419,7 +419,7 @@ xencomm_hypercall_callback_op(int cmd, v
}
static int
-xencommize_memory_reservation(struct xencomm_mini *xc_area,
+xencommize_memory_reservation(struct xencomm_mini **xc_area,
xen_memory_reservation_t *mop)
{
struct xencomm_handle *desc;
@@ -427,11 +427,12 @@ xencommize_memory_reservation(struct xen
desc = __xencomm_map_no_alloc(xen_guest_handle(mop->extent_start),
mop->nr_extents *
sizeof(*xen_guest_handle(mop->extent_start)),
- xc_area);
+ *xc_area);
if (desc == NULL)
return -EINVAL;
set_xen_guest_handle(mop->extent_start, (void *)desc);
+ (*xc_area)++;
return 0;
}
@@ -456,10 +457,9 @@ xencomm_hypercall_memory_op(unsigned int
xen_guest_handle(xmr->extent_start));
argsize = sizeof(*xmr);
- rc = xencommize_memory_reservation(xc_area, xmr);
+ rc = xencommize_memory_reservation(&xc_area, xmr);
if (rc)
return rc;
- xc_area++;
break;
case XENMEM_maximum_gpfn:
@@ -479,14 +479,12 @@ xencomm_hypercall_memory_op(unsigned int
xen_guest_handle(xme_out->extent_start));
argsize = sizeof(xen_memory_exchange_t);
- rc = xencommize_memory_reservation(xc_area, xme_in);
+ rc = xencommize_memory_reservation(&xc_area, xme_in);
if (rc)
return rc;
- xc_area++;
- rc = xencommize_memory_reservation(xc_area, xme_out);
+ rc = xencommize_memory_reservation(&xc_area, xme_out);
if (rc)
return rc;
- xc_area++;
break;
case XENMEM_add_to_physmap:
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home