ia64/linux-2.6.18-xen.hg

changeset 766:ad300e728982

[IA64] clean up of xcom_hcall.c.

make xencommize_xxx() calling convention consistent.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Isaku Yamahata <yamahata@valinux.co.jp>
date Mon Jan 05 12:11:43 2009 +0900 (2009-01-05)
parents d5c2e97b87ac
children 79bf5894b3f9
files arch/ia64/xen/xcom_hcall.c
line diff
     1.1 --- a/arch/ia64/xen/xcom_hcall.c	Mon Jan 05 11:32:31 2009 +0900
     1.2 +++ b/arch/ia64/xen/xcom_hcall.c	Mon Jan 05 12:11:43 2009 +0900
     1.3 @@ -86,7 +86,7 @@ xencomm_hypercall_event_channel_op(int c
     1.4  {
     1.5  	int rc;
     1.6  	struct xencomm_handle *desc;
     1.7 -	XENCOMM_MINI_ALIGNED(xc_area, 2);
     1.8 +	XENCOMM_MINI_ALIGNED(xc_area, 1);
     1.9  
    1.10  	rc = xencommize_event_channel_op(&xc_area, op, &desc);
    1.11  	if (rc)
    1.12 @@ -187,7 +187,7 @@ xencomm_hypercall_physdev_op(int cmd, vo
    1.13  {
    1.14  	int rc;
    1.15  	struct xencomm_handle *desc;
    1.16 -	XENCOMM_MINI_ALIGNED(xc_area, 2);
    1.17 +	XENCOMM_MINI_ALIGNED(xc_area, 1);
    1.18  
    1.19  	rc = xencommize_physdev_op(&xc_area, cmd, op, &desc);
    1.20  	if (rc)
    1.21 @@ -419,7 +419,7 @@ xencomm_hypercall_callback_op(int cmd, v
    1.22  }
    1.23  
    1.24  static int
    1.25 -xencommize_memory_reservation(struct xencomm_mini *xc_area,
    1.26 +xencommize_memory_reservation(struct xencomm_mini **xc_area,
    1.27  			      xen_memory_reservation_t *mop)
    1.28  {
    1.29  	struct xencomm_handle *desc;
    1.30 @@ -427,11 +427,12 @@ xencommize_memory_reservation(struct xen
    1.31  	desc = __xencomm_map_no_alloc(xen_guest_handle(mop->extent_start),
    1.32  			mop->nr_extents *
    1.33  			sizeof(*xen_guest_handle(mop->extent_start)),
    1.34 -			xc_area);
    1.35 +			*xc_area);
    1.36  	if (desc == NULL)
    1.37  		return -EINVAL;
    1.38  
    1.39  	set_xen_guest_handle(mop->extent_start, (void *)desc);
    1.40 +	(*xc_area)++;
    1.41  	return 0;
    1.42  }
    1.43  
    1.44 @@ -456,10 +457,9 @@ xencomm_hypercall_memory_op(unsigned int
    1.45  				     xen_guest_handle(xmr->extent_start));
    1.46  
    1.47  		argsize = sizeof(*xmr);
    1.48 -		rc = xencommize_memory_reservation(xc_area, xmr);
    1.49 +		rc = xencommize_memory_reservation(&xc_area, xmr);
    1.50  		if (rc)
    1.51  			return rc;
    1.52 -		xc_area++;
    1.53  		break;
    1.54  
    1.55  	case XENMEM_maximum_gpfn:
    1.56 @@ -479,14 +479,12 @@ xencomm_hypercall_memory_op(unsigned int
    1.57  				     xen_guest_handle(xme_out->extent_start));
    1.58  
    1.59  		argsize = sizeof(xen_memory_exchange_t);
    1.60 -		rc = xencommize_memory_reservation(xc_area, xme_in);
    1.61 +		rc = xencommize_memory_reservation(&xc_area, xme_in);
    1.62  		if (rc)
    1.63  			return rc;
    1.64 -		xc_area++;
    1.65 -		rc = xencommize_memory_reservation(xc_area, xme_out);
    1.66 +		rc = xencommize_memory_reservation(&xc_area, xme_out);
    1.67  		if (rc)
    1.68  			return rc;
    1.69 -		xc_area++;
    1.70  		break;
    1.71  
    1.72  	case XENMEM_add_to_physmap: