Re: [Xen-devel] [PATCH 11/16] x86/monitor: fix: treat -monitor- properly, as a subsys of the vm-event subsys

[Tamas K Lengyel <tamas@xxxxxxxxxxxxx>]

> diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c
> index aeee435..4a29cad 100644
> --- a/xen/arch/x86/monitor.c
> +++ b/xen/arch/x86/monitor.c
> @@ -62,6 +62,8 @@ int monitor_init_domain(struct domain *d)
>              return -ENOMEM;
>      }
>
> +    d->monitor.initialised = 1;
> +
>      return 0;
>  }
>
> @@ -78,6 +80,7 @@ void monitor_cleanup_domain(struct domain *d)
>
>      memset(&d->arch.monitor, 0, sizeof(d->arch.monitor));
>      memset(&d->monitor, 0, sizeof(d->monitor));
> +    d->monitor.initialised = 0;

So d->monitor is already memset to zero above, thus this is not needed here.

>  }
>
>  void monitor_ctrlreg_write_resume(struct vcpu *v, vm_event_response_t *rsp)
> diff --git a/xen/include/asm-arm/monitor.h b/xen/include/asm-arm/monitor.h
> index 9a9734a..7ef30f1 100644

[snip]

> diff --git a/xen/include/xen/monitor.h b/xen/include/xen/monitor.h
> index 2171d04..605caf0 100644
> --- a/xen/include/xen/monitor.h
> +++ b/xen/include/xen/monitor.h
> @@ -22,12 +22,15 @@
>  #ifndef __XEN_MONITOR_H__
>  #define __XEN_MONITOR_H__
>
> -#include <public/vm_event.h>
> -
> -struct domain;
> -struct xen_domctl_monitor_op;
> +#include <xen/sched.h>
>
>  int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *op);
> +
> +static inline bool_t monitor_domain_initialised(const struct domain *d)
> +{
> +    return d->monitor.initialised;

This should be !!d->monitor.initialised.

> +}
> +
>  void monitor_guest_request(void);
>
>  int monitor_traps(struct vcpu *v, bool_t sync, vm_event_request_t *req);

Cheers,
Tamas

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel