[libvirt] [PATCH 1/2] qemu: Warn on possibly incorrect usage of EnterMonitor*

Jonathon Jongsma jjongsma at redhat.com
Thu Nov 7 15:22:17 UTC 2019


On Thu, 2019-11-07 at 14:18 +0100, Michal Privoznik wrote:
> The qemuDomainObjEnterMonitor() should not be called from without
> a job set. Catch this error and produce a warning message if such
> call occurred.

s/from//

Reviewed-by: Jonathon Jongsma <jjongsma at redhat.com>


> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_domain.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index 667cc89072..4661deb027 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -8682,6 +8682,11 @@
> qemuDomainObjEnterMonitorInternal(virQEMUDriverPtr driver,
>      } else if (priv->job.asyncOwner == virThreadSelfID()) {
>          VIR_WARN("This thread seems to be the async job owner;
> entering"
>                   " monitor without asking for a nested job is
> dangerous");
> +    } else if (priv->job.owner != virThreadSelfID()) {
> +        VIR_WARN("Entering a monitor without owning a job. "
> +                 "Job %s owner %s (%llu)",
> +                 qemuDomainJobTypeToString(priv->job.active),
> +                 priv->job.ownerAPI, priv->job.owner);
>      }
>  
>      VIR_DEBUG("Entering monitor (mon=%p vm=%p name=%s)",




More information about the libvir-list mailing list