[libvirt] [PATCH 5/7] qemu: assume -no-reboot is always available

[John Ferlan]

On 11/05/2015 12:33 PM, Daniel P. Berrange wrote:
> The -no-reboot arg was added in QEMU 0.9.0, so the QEMU driver
> can now assume it is always present.
> 
> Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
> ---
>  src/qemu/qemu_capabilities.c                       |  3 ---
>  src/qemu/qemu_capabilities.h                       |  2 +-
>  src/qemu/qemu_command.c                            | 14 ++++++--------
>  tests/qemucapabilitiesdata/caps_1.2.2-1.caps       |  1 -
>  tests/qemucapabilitiesdata/caps_1.3.1-1.caps       |  1 -
>  tests/qemucapabilitiesdata/caps_1.4.2-1.caps       |  1 -
>  tests/qemucapabilitiesdata/caps_1.5.3-1.caps       |  1 -
>  tests/qemucapabilitiesdata/caps_1.6.0-1.caps       |  1 -
>  tests/qemucapabilitiesdata/caps_1.6.50-1.caps      |  1 -
>  tests/qemucapabilitiesdata/caps_2.1.1-1.caps       |  1 -
>  tests/qemucaps2xmldata/all_1.6.0-1.caps            |  1 -
>  tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps |  1 -
>  tests/qemuhelptest.c                               |  8 --------
>  tests/qemuxml2argvtest.c                           |  1 -
>  tests/qemuxml2xmltest.c                            |  1 -
>  tests/qemuxmlnstest.c                              |  1 -
>  16 files changed, 7 insertions(+), 32 deletions(-)
> 

[...]

Format nit

> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index cd79544..77913b3 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -9774,15 +9774,13 @@ qemuBuildCommandLine(virConnectPtr conn,
>          }
>      }
>  
> -    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_REBOOT)) {
> -        /* Only add -no-reboot option if each event destroys domain */
> -        if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY &&
> -            def->onPoweroff == VIR_DOMAIN_LIFECYCLE_DESTROY &&
> -            (def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY ||
> -             def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY)) {
> -            allowReboot = false;
> +    /* Only add -no-reboot option if each event destroys domain */
> +    if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY &&
> +        def->onPoweroff == VIR_DOMAIN_LIFECYCLE_DESTROY &&
> +        (def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY ||
> +         def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY)) {
> +        allowReboot = false;
>              virCommandAddArg(cmd, "-no-reboot");

This line needs to move left 4 spaces

> -        }
>      }
>  
>      /* If JSON monitor is enabled, we can receive an event