[libvirt] [libvirt PATCH v2 34/44] Deprecate QEMU_CAPS_WAKEUP

Andrea Bolognani abologna at redhat.com
Tue Apr 17 08:46:55 UTC 2018


On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 06b5d1387d..2cfcbacaf0 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -18747,15 +18747,6 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom,
>          goto endjob;
>      }
>  
> -    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_WAKEUP) &&
> -        (target == VIR_NODE_SUSPEND_TARGET_MEM ||
> -         target == VIR_NODE_SUSPEND_TARGET_HYBRID)) {
> -        virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
> -                       _("Unable to suspend domain due to "
> -                         "missing system_wakeup monitor command"));
> -        goto endjob;
> -    }
> -
>      if (vm->def->pm.s3 || vm->def->pm.s4) {
>          if (vm->def->pm.s3 == VIR_TRISTATE_BOOL_NO &&
>              (target == VIR_NODE_SUSPEND_TARGET_MEM ||
> @@ -18816,13 +18807,6 @@ qemuDomainPMWakeup(virDomainPtr dom,
>  
>      priv = vm->privateData;
>  
> -    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_WAKEUP)) {
> -       virReportError(VIR_ERR_OPERATION_INVALID, "%s",
> -                      _("Unable to wake up domain due to "
> -                        "missing system_wakeup monitor command"));
> -       goto endjob;
> -    }
> -

Now that you removed all uses of 'priv', it doesn't compile
anymore:

  qemu/qemu_driver.c: In function 'qemuDomainPMSuspendForDuration':
  qemu/qemu_driver.c:18699:29: error: variable 'priv' set but not used [-Werror=unused-but-set-variable]
       qemuDomainObjPrivatePtr priv;
                               ^~~~

Simple enough to fix.

Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization




More information about the libvir-list mailing list