[Xen-ia64-devel] [PATCH] clean up of xcom_hcall.c.

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

[IA64] clean up of xcom_hcall.c.

make xencommize_xxx() calling convention consistent.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff --git a/arch/ia64/xen/xcom_hcall.c b/arch/ia64/xen/xcom_hcall.c
--- a/arch/ia64/xen/xcom_hcall.c
+++ b/arch/ia64/xen/xcom_hcall.c
@@ -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:


-- 
yamahata

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel