[libvirt] [PATCH v2 1/3] qemu: Move allow reboot check setting

[Michal Privoznik]

On 11/01/2018 05:04 PM, John Ferlan wrote:
> Checking and setting the priv->allowReboot can be done before we start
> processing the job. A subsequent patch will make use of the value to
> make decisions in the error label, so we need to have it set properly.
> 
> Signed-off-by: John Ferlan <jferlan at redhat.com>
> ---
>  src/qemu/qemu_process.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 9cf971808c..5232f761af 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -7767,6 +7767,10 @@ qemuProcessReconnect(void *opaque)
>      cfg = virQEMUDriverGetConfig(driver);
>      priv = obj->privateData;
>  
> +    /* If we are connecting to a guest started by old libvirt there is no
> +     * allowReboot in status XML and we need to initialize it. */
> +    qemuProcessPrepareAllowReboot(obj);

I'm not quite sure why this happens outside of job. It doesn't look like
it has to.

> +
>      if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
>          goto error;
>  
> @@ -7783,10 +7787,6 @@ qemuProcessReconnect(void *opaque)
>      if (qemuDomainMasterKeyReadFile(priv) < 0)
>          goto error;
>  
> -    /* If we are connecting to a guest started by old libvirt there is no
> -     * allowReboot in status XML and we need to initialize it. */
> -    qemuProcessPrepareAllowReboot(obj);
> -
>      if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0)
>          goto error;
>  
> 

Michal