[libvirt] [PATCH] qemu: Introduce state_lock_timeout to qemu.conf

[wang.yi59 at zte.com.cn]

> Yi Wang <wang.yi59 at zte.com.cn> [2018-09-13, 10:39AM +0800]:
> > diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> > index 886e3fb..306772a 100644
> > --- a/src/qemu/qemu_domain.c
> > +++ b/src/qemu/qemu_domain.c
> > @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv,
> >               priv->job.agentActive == QEMU_AGENT_JOB_NONE));
> >  }
> >
> > -/* Give up waiting for mutex after 30 seconds */
> > -#define QEMU_JOB_WAIT_TIME (1000ull * 30)
> > -
> >  /**
> >   * qemuDomainObjBeginJobInternal:
> >   * @driver: qemu driver
> > @@ -6714,7 +6711,9 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver,
> >      }
> >
> >      priv->jobs_queued++;
> > -    then = now + QEMU_JOB_WAIT_TIME;
> > +
> > +    cfg->stateLockTimeout *= 1000;
>
> This doesn't look right. Each time qemuDomainObjBeginJobInternal is
> called, the global config value gets multiplied.
>
> > +    then = now + cfg->stateLockTimeout;
>
> Why not just
>
>     then = now + cfg->stateLockTimeout * 1000;
>
> ?
Quite right. :-(
Many thanks.


---
Best wishes
Yi Wang