|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v2] x86/hvm: Clean up the rest of bool_t from vm_event
Any changes required for this to go in?
Regards,
Alex
On 29.10.2018 17:53, Alexandru Stefan ISAILA wrote:
> Signed-off-by: Alexandru Isaila <aisaila@xxxxxxxxxxxxxxx>
> Acked-by: Tamas K Lengyel <tamas@xxxxxxxxxxxxx>
> Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
>
> ---
> Changes since V1:
> - Made style corrections suggested by Jan.
> ---
> xen/arch/x86/hvm/hvm.c | 3 ++-
> xen/arch/x86/mm/mem_sharing.c | 2 +-
> xen/arch/x86/mm/p2m.c | 5 ++---
> xen/common/memory.c | 2 +-
> xen/common/vm_event.c | 4 ++--
> xen/include/asm-x86/mem_sharing.h | 2 +-
> xen/include/xen/vm_event.h | 8 ++++----
> 7 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
> index a140e60c9c..a8566fb87c 100644
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -1905,7 +1905,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned
> long gla,
> if ( sharing_enomem )
> {
> int rv;
> - if ( (rv = mem_sharing_notify_enomem(currd, gfn, 1)) < 0 )
> +
> + if ( (rv = mem_sharing_notify_enomem(currd, gfn, true)) < 0 )
> {
> gdprintk(XENLOG_ERR, "Domain %hu attempt to unshare "
> "gfn %lx, ENOMEM and no helper (rc %d)\n",
> diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c
> index 1dab2c8cc3..be09c8871a 100644
> --- a/xen/arch/x86/mm/mem_sharing.c
> +++ b/xen/arch/x86/mm/mem_sharing.c
> @@ -546,7 +546,7 @@ static int audit(void)
> }
>
> int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn,
> - bool_t allow_sleep)
> + bool allow_sleep)
> {
> struct vcpu *v = current;
> int rc;
> diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
> index a00a3c1bff..4bdc5e34e0 100644
> --- a/xen/arch/x86/mm/p2m.c
> +++ b/xen/arch/x86/mm/p2m.c
> @@ -448,7 +448,7 @@ mfn_t __get_gfn_type_access(struct p2m_domain *p2m,
> unsigned long gfn_l,
> /* Try to unshare. If we fail, communicate ENOMEM without
> * sleeping. */
> if ( mem_sharing_unshare_page(p2m->domain, gfn_l, 0) < 0 )
> - (void)mem_sharing_notify_enomem(p2m->domain, gfn_l, 0);
> + mem_sharing_notify_enomem(p2m->domain, gfn_l, false);
> mfn = p2m->get_entry(p2m, gfn, t, a, q, page_order, NULL);
> }
>
> @@ -839,8 +839,7 @@ guest_physmap_add_entry(struct domain *d, gfn_t gfn,
> mfn_t mfn,
> * Foreign domains are okay to place an event as they
> * won't go to sleep. */
> (void)mem_sharing_notify_enomem(p2m->domain,
> - gfn_x(gfn_add(gfn, i)),
> - 0);
> + gfn_x(gfn_add(gfn, i)),
> false);
> return rc;
> }
> omfn = p2m->get_entry(p2m, gfn_add(gfn, i),
> diff --git a/xen/common/memory.c b/xen/common/memory.c
> index 987395fbb3..b68efd4d9f 100644
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -356,7 +356,7 @@ int guest_remove_page(struct domain *d, unsigned long
> gmfn)
> rc = mem_sharing_unshare_page(d, gmfn, 0);
> if ( rc )
> {
> - (void)mem_sharing_notify_enomem(d, gmfn, 0);
> + mem_sharing_notify_enomem(d, gmfn, false);
> goto out_put_gfn;
> }
> /* Maybe the mfn changed */
> diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c
> index 6ffd18a448..26cfa2c605 100644
> --- a/xen/common/vm_event.c
> +++ b/xen/common/vm_event.c
> @@ -496,7 +496,7 @@ static int vm_event_wait_slot(struct vm_event_domain *ved)
> return rc;
> }
>
> -bool_t vm_event_check_ring(struct vm_event_domain *ved)
> +bool vm_event_check_ring(struct vm_event_domain *ved)
> {
> return (ved && ved->ring_page);
> }
> @@ -514,7 +514,7 @@ bool_t vm_event_check_ring(struct vm_event_domain *ved)
> *
> */
> int __vm_event_claim_slot(struct domain *d, struct vm_event_domain *ved,
> - bool_t allow_sleep)
> + bool allow_sleep)
> {
> if ( !vm_event_check_ring(ved) )
> return -EOPNOTSUPP;
> diff --git a/xen/include/asm-x86/mem_sharing.h
> b/xen/include/asm-x86/mem_sharing.h
> index 91908924df..0e77b7d935 100644
> --- a/xen/include/asm-x86/mem_sharing.h
> +++ b/xen/include/asm-x86/mem_sharing.h
> @@ -84,7 +84,7 @@ static inline int mem_sharing_unshare_page(struct domain *d,
> * then it's the same as a foreign domain.
> */
> int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn,
> - bool_t allow_sleep);
> + bool allow_sleep);
> int mem_sharing_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_sharing_op_t) arg);
> int mem_sharing_domctl(struct domain *d,
> struct xen_domctl_mem_sharing_op *mec);
> diff --git a/xen/include/xen/vm_event.h b/xen/include/xen/vm_event.h
> index 2ff6e1c333..5302ee55c1 100644
> --- a/xen/include/xen/vm_event.h
> +++ b/xen/include/xen/vm_event.h
> @@ -30,7 +30,7 @@
> void vm_event_cleanup(struct domain *d);
>
> /* Returns whether a ring has been set up */
> -bool_t vm_event_check_ring(struct vm_event_domain *ved);
> +bool vm_event_check_ring(struct vm_event_domain *ved);
>
> /* 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
> @@ -46,17 +46,17 @@ bool_t vm_event_check_ring(struct vm_event_domain *ved);
> * succeed.
> */
> int __vm_event_claim_slot(struct domain *d, struct vm_event_domain *ved,
> - bool_t allow_sleep);
> + bool allow_sleep);
> static inline int vm_event_claim_slot(struct domain *d,
> struct vm_event_domain *ved)
> {
> - return __vm_event_claim_slot(d, ved, 1);
> + return __vm_event_claim_slot(d, ved, true);
> }
>
> static inline int vm_event_claim_slot_nosleep(struct domain *d,
> struct vm_event_domain *ved)
> {
> - return __vm_event_claim_slot(d, ved, 0);
> + return __vm_event_claim_slot(d, ved, false);
> }
>
> void vm_event_cancel_slot(struct domain *d, struct vm_event_domain *ved);
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |