From: Tamas K Lengyel Date: Fri, 26 Sep 2014 14:28:57 +0000 (+0200) Subject: mem_event: clean out superfluous white-spaces X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4311 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e054d5762cadb243089cc58a2eb9696f34ef0cfe;p=xen.git mem_event: clean out superfluous white-spaces Signed-off-by: Tamas K Lengyel Acked-by: Tim Deegan --- diff --git a/xen/common/mem_event.c b/xen/common/mem_event.c index 04e3b0e299..a7e97670a3 100644 --- a/xen/common/mem_event.c +++ b/xen/common/mem_event.c @@ -64,7 +64,7 @@ static int mem_event_enable( if ( med->ring_page ) return -EBUSY; - /* The parameter defaults to zero, and it should be + /* The parameter defaults to zero, and it should be * set to something */ if ( ring_gfn == 0 ) return -ENOSYS; @@ -72,7 +72,7 @@ static int mem_event_enable( mem_event_ring_lock_init(med); mem_event_ring_lock(med); - rc = prepare_ring_for_helper(d, ring_gfn, &med->ring_pg_struct, + rc = prepare_ring_for_helper(d, ring_gfn, &med->ring_pg_struct, &med->ring_page); if ( rc < 0 ) goto err; @@ -104,7 +104,7 @@ static int mem_event_enable( return 0; err: - destroy_ring_for_helper(&med->ring_page, + destroy_ring_for_helper(&med->ring_page, med->ring_pg_struct); mem_event_ring_unlock(med); @@ -233,7 +233,7 @@ static int mem_event_disable(struct domain *d, struct mem_event_domain *med) } } - destroy_ring_for_helper(&med->ring_page, + destroy_ring_for_helper(&med->ring_page, med->ring_pg_struct); mem_event_ring_unlock(med); } @@ -497,7 +497,7 @@ void mem_event_cleanup(struct domain *d) * the disable routine to complete. It will also drop * all domain refs the wait-queued vcpus are holding. * Finally, because this code path involves previously - * pausing the domain (domain_kill), unpausing the + * pausing the domain (domain_kill), unpausing the * vcpus causes no harm. */ destroy_waitqueue_head(&d->mem_event->paging.wq); (void)mem_event_disable(d, &d->mem_event->paging); @@ -583,7 +583,7 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, if ( p2m->pod.entry_count ) break; - rc = mem_event_enable(d, mec, med, _VPF_mem_paging, + rc = mem_event_enable(d, mec, med, _VPF_mem_paging, HVM_PARAM_PAGING_RING_PFN, mem_paging_notification); } @@ -605,7 +605,7 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, #endif #ifdef HAS_MEM_ACCESS - case XEN_DOMCTL_MEM_EVENT_OP_ACCESS: + case XEN_DOMCTL_MEM_EVENT_OP_ACCESS: { struct mem_event_domain *med = &d->mem_event->access; rc = -EINVAL; @@ -624,7 +624,7 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, if ( !cpu_has_vmx ) break; - rc = mem_event_enable(d, mec, med, _VPF_mem_access, + rc = mem_event_enable(d, mec, med, _VPF_mem_access, HVM_PARAM_ACCESS_RING_PFN, mem_access_notification); @@ -654,7 +654,7 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, #endif #ifdef HAS_MEM_SHARING - case XEN_DOMCTL_MEM_EVENT_OP_SHARING: + case XEN_DOMCTL_MEM_EVENT_OP_SHARING: { struct mem_event_domain *med = &d->mem_event->share; rc = -EINVAL; @@ -673,7 +673,7 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, if ( !hap_enabled(d) ) break; - rc = mem_event_enable(d, mec, med, _VPF_mem_sharing, + rc = mem_event_enable(d, mec, med, _VPF_mem_sharing, HVM_PARAM_SHARING_RING_PFN, mem_sharing_notification); } diff --git a/xen/include/xen/mem_event.h b/xen/include/xen/mem_event.h index 8612b26f7c..4f3ad8e382 100644 --- a/xen/include/xen/mem_event.h +++ b/xen/include/xen/mem_event.h @@ -37,19 +37,19 @@ bool_t mem_event_check_ring(struct mem_event_domain *med); /* Returns 0 on success, -ENOSYS if there is no ring, -EBUSY if there is no * available space and the caller is a foreign domain. If the guest itself * is the caller, -EBUSY is avoided by sleeping on a wait queue to ensure - * that the ring does not lose future events. + * that the ring does not lose future events. * * However, the allow_sleep flag can be set to false in cases in which it is ok * to lose future events, and thus -EBUSY can be returned to guest vcpus - * (handle with care!). + * (handle with care!). * * In general, you must follow a claim_slot() call with either put_request() or * cancel_slot(), both of which are guaranteed to - * succeed. + * succeed. */ int __mem_event_claim_slot(struct domain *d, struct mem_event_domain *med, bool_t allow_sleep); -static inline int mem_event_claim_slot(struct domain *d, +static inline int mem_event_claim_slot(struct domain *d, struct mem_event_domain *med) { return __mem_event_claim_slot(d, med, 1);