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

[Andrea Bolognani]

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 

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

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

[Ján Tomko]

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_capabilities.c   |  2 --
 src/qemu/qemu_capabilities.h   |  2 +-
 src/qemu/qemu_driver.c | 16 
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   |  1 -
 28 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6fb39a1027..4dc94b8561 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -964,7 +964,6 @@ struct virQEMUCapsStringFlags {
 
 
 struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
-{ "system_wakeup", QEMU_CAPS_WAKEUP },
 { "transaction", QEMU_CAPS_TRANSACTION },
 { "block-stream", QEMU_CAPS_BLOCKJOB_ASYNC },
 { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY },
@@ -3630,7 +3629,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 79bab9359d..b36693f072 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -168,7 +168,7 @@ typedef enum {
 
 /* 85 */
 X_QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */
-QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */
+X_QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */
 QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */
 QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */
 QEMU_CAPS_TRANSACTION, /* transaction monitor command */
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;
-}
-
 qemuDomainObjEnterMonitor(driver, vm);
 ret = qemuMonitorSystemWakeup(priv->mon);
 if (qemuDomainObjExitMonitor(driver, vm) < 0)
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 9fdb4cedeb..bcc623e020 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -29,7 +29,6 @@
   
   
   
-  
   
   
   
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 2a1eb0b655..0d65b93608 100644