[libvirt PATCH 5/7] qemu: remove ignore_value for qemuDomainObjExitMonitor

Wednesday, 24 November 2021

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt;
---
 src/qemu/qemu_backup.c    |  4 ++--
 src/qemu/qemu_block.c     |  2 +-
 src/qemu/qemu_domain.c    |  2 +-
 src/qemu/qemu_driver.c    | 18 +++++++++---------
 src/qemu/qemu_hotplug.c   | 26 +++++++++++++-------------
 src/qemu/qemu_migration.c | 14 +++++++-------
 src/qemu/qemu_process.c   |  2 +-
 src/qemu/qemu_snapshot.c  |  2 +-
 8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 8e191d344e..304a0d5a4f 100644
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -132,7 +132,7 @@ qemuBackupDiskDataCleanupOne(virDomainObj *vm,
         if (dd->added) {
             qemuDomainObjEnterMonitor(priv->driver, vm);
             qemuBlockStorageSourceAttachRollback(priv->mon,
dd->crdata->srcdata[0]);
-            ignore_value(qemuDomainObjExitMonitor(priv->driver, vm));
+            qemuDomainObjExitMonitor(priv->driver, vm);
         }
 
         if (dd->created) {
@@ -935,7 +935,7 @@ qemuBackupBegin(virDomainObj *vm,
             ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias, false));
         if (tlsSecretAlias)
             ignore_value(qemuMonitorDelObject(priv->mon, tlsSecretAlias, false));
-        ignore_value(qemuDomainObjExitMonitor(priv->driver, vm));
+        qemuDomainObjExitMonitor(priv->driver, vm);
     }
 
     if (ret < 0 && !job_started && priv->backup)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 04f5e383bc..8a10d2aa0c 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2906,7 +2906,7 @@ qemuBlockStorageSourceCreate(virDomainObj *vm,
         qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) == 0) {
 
         qemuBlockStorageSourceAttachRollback(priv->mon, data);
-        ignore_value(qemuDomainObjExitMonitor(priv->driver, vm));
+        qemuDomainObjExitMonitor(priv->driver, vm);
     }
 
     return ret;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b0b2dd0258..94b4081da6 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6968,7 +6968,7 @@ qemuDomainSnapshotDiscard(virQEMUDriver *driver,
             qemuDomainObjEnterMonitor(driver, vm);
             /* we continue on even in the face of error */
             qemuMonitorDeleteSnapshot(priv->mon, snap->def->name);
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
         }
     }
 
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4a48354df1..28a9ae09e5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3120,7 +3120,7 @@ qemuDumpToFd(virQEMUDriver *driver,
                            _("unsupported dumpformat '%s' "
                              "for this QEMU binary"),
                            dumpformat);
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
             return -1;
         }
     }
@@ -3419,7 +3419,7 @@ qemuDomainScreenshot(virDomainPtr dom,
 
     qemuDomainObjEnterMonitor(driver, vm);
     if (qemuMonitorScreendump(priv->mon, videoAlias, screen, tmp) < 0) {
-        ignore_value(qemuDomainObjExitMonitor(driver, vm));
+        qemuDomainObjExitMonitor(driver, vm);
         goto endjob;
     }
     qemuDomainObjExitMonitor(driver, vm);
@@ -5302,7 +5302,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver,
             if (qemuMonitorDelObject(priv->mon, alias, true) < 0)
                 VIR_WARN("deletion of iothread object %d of domain %s failed when
cleanup",
                          iothread_id, vm->def->name);
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
         }
     }
 
@@ -5317,7 +5317,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver,
     return ret;
 
  exit_monitor:
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     goto cleanup;
 }
 
@@ -5405,7 +5405,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriver *driver,
     return ret;
 
  exit_monitor:
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     goto cleanup;
 }
 
@@ -9907,7 +9907,7 @@ qemuDomainBlockResize(virDomainPtr dom,
 
     qemuDomainObjEnterMonitor(driver, vm);
     if (qemuMonitorBlockResize(priv->mon, device, nodename, size) < 0) {
-        ignore_value(qemuDomainObjExitMonitor(driver, vm));
+        qemuDomainObjExitMonitor(driver, vm);
         goto endjob;
     }
     qemuDomainObjExitMonitor(driver, vm);
@@ -10796,12 +10796,12 @@ qemuDomainMemoryPeek(virDomainPtr dom,
     qemuDomainObjEnterMonitor(driver, vm);
     if (flags == VIR_MEMORY_VIRTUAL) {
         if (qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp) < 0) {
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
             goto endjob;
         }
     } else {
         if (qemuMonitorSavePhysicalMemory(priv->mon, offset, size, tmp) < 0) {
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
             goto endjob;
         }
     }
@@ -15184,7 +15184,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
                 qemuBlockStorageSourceChainDetach(priv->mon, data);
             if (crdata)
                 qemuBlockStorageSourceAttachRollback(priv->mon,
crdata->srcdata[0]);
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
         }
         if (need_revoke)
             qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror);
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index e886fbc35d..43d86dbb65 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1442,7 +1442,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
         if (qemuMonitorAddFileHandleToSet(priv->mon, vdpafd, -1,
                                           net->data.vdpa.devicepath,
                                           &fdinfo) < 0) {
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
             goto cleanup;
         }
         vdpafdName = g_strdup_printf("/dev/fdset/%d", fdinfo.fdset);
@@ -1452,13 +1452,13 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
                                            tapfdName, tapfdSize,
                                            vhostfdName, vhostfdSize,
                                            slirpfdName, vdpafdName))) {
-        ignore_value(qemuDomainObjExitMonitor(driver, vm));
+        qemuDomainObjExitMonitor(driver, vm);
         goto cleanup;
     }
 
     if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
         if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vhostuser)
< 0) {
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
             virDomainAuditNet(vm, NULL, net, "attach", false);
             goto cleanup;
         }
@@ -1469,7 +1469,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
                              tapfd, tapfdName, tapfdSize,
                              vhostfd, vhostfdName, vhostfdSize,
                              slirpfd, slirpfdName) < 0) {
-        ignore_value(qemuDomainObjExitMonitor(driver, vm));
+        qemuDomainObjExitMonitor(driver, vm);
         virDomainAuditNet(vm, NULL, net, "attach", false);
         goto try_remove;
     }
@@ -1488,14 +1488,14 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
     qemuDomainObjEnterMonitor(driver, vm);
 
     if (qemuDomainAttachExtensionDevice(priv->mon, &net->info) < 0) {
-        ignore_value(qemuDomainObjExitMonitor(driver, vm));
+        qemuDomainObjExitMonitor(driver, vm);
         virDomainAuditNet(vm, NULL, net, "attach", false);
         goto try_remove;
     }
 
     if (qemuMonitorAddDeviceProps(priv->mon, &nicprops) < 0) {
         ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &net->info));
-        ignore_value(qemuDomainObjExitMonitor(driver, vm));
+        qemuDomainObjExitMonitor(driver, vm);
         virDomainAuditNet(vm, NULL, net, "attach", false);
         goto try_remove;
     }
@@ -1510,7 +1510,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
             qemuDomainObjEnterMonitor(driver, vm);
 
             if (qemuMonitorSetLink(priv->mon, net->info.alias,
VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) < 0) {
-                ignore_value(qemuDomainObjExitMonitor(driver, vm));
+                qemuDomainObjExitMonitor(driver, vm);
                 virDomainAuditNet(vm, NULL, net, "attach", false);
                 goto try_remove;
             }
@@ -1609,7 +1609,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
         qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0)
         VIR_WARN("Failed to remove network backend for netdev %s",
                  netdev_name);
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     virErrorRestore(&originalError);
     goto cleanup;
 }
@@ -1769,7 +1769,7 @@ qemuDomainDelTLSObjects(virQEMUDriver *driver,
     if (secAlias)
         ignore_value(qemuMonitorDelObject(priv->mon, secAlias, false));
 
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
 
  cleanup:
     virErrorRestore(&orig_err);
@@ -1806,7 +1806,7 @@ qemuDomainAddTLSObjects(virQEMUDriver *driver,
 
  error:
     virErrorPreserveLast(&orig_err);
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     virErrorRestore(&orig_err);
     qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL);
 
@@ -1989,7 +1989,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *driver,
     /* detach associated chardev on error */
     if (chardevAdded)
         ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias));
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     virErrorRestore(&orig_err);
     qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
                             secAlias, tlsAlias);
@@ -2264,7 +2264,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver,
     /* detach associated chardev on error */
     if (chardevAttached)
         qemuMonitorDetachCharDev(priv->mon, charAlias);
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     virErrorRestore(&orig_err);
 
     qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
@@ -2690,7 +2690,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver,
  exit_monitor:
     virErrorPreserveLast(&orig_err);
     qemuBlockStorageSourceAttachRollback(priv->mon, data);
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     virErrorRestore(&orig_err);
 
     virDomainAuditHostdev(vm, hostdev, "attach", false);
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a544e9e2fd..3cb39264e3 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -529,7 +529,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver,
     return ret;
 
  exit_monitor:
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     goto cleanup;
 }
 
@@ -4368,7 +4368,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
             qemuDomainObjEnterMonitorAsync(driver, vm,
                                            QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) {
             qemuMonitorMigrateCancel(priv->mon);
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
         }
 
         /* cancel any outstanding NBD jobs */
@@ -4389,7 +4389,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
     goto cleanup;
 
  exit_monitor:
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     goto error;
 }
 
@@ -5970,11 +5970,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
         if (virSetCloseExec(pipeFD[1]) < 0) {
             virReportSystemError(errno, "%s",
                                  _("Unable to set cloexec flag"));
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
             goto cleanup;
         }
         if (virCommandRunAsync(compressor, NULL) < 0) {
-            ignore_value(qemuDomainObjExitMonitor(driver, vm));
+            qemuDomainObjExitMonitor(driver, vm);
             goto cleanup;
         }
         rc = qemuMonitorMigrateToFd(priv->mon,
@@ -5997,7 +5997,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
             if (virDomainObjIsActive(vm) &&
                 qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
                 qemuMonitorMigrateCancel(priv->mon);
-                ignore_value(qemuDomainObjExitMonitor(driver, vm));
+                qemuDomainObjExitMonitor(driver, vm);
             }
         }
         goto cleanup;
@@ -6024,7 +6024,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
         } else {
             if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
                 qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth);
-                ignore_value(qemuDomainObjExitMonitor(driver, vm));
+                qemuDomainObjExitMonitor(driver, vm);
             }
         }
         priv->migMaxBandwidth = saveMigBandwidth;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index dcd547b279..34302b404a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3195,7 +3195,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver,
     return ret;
 
  error:
-    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+    qemuDomainObjExitMonitor(driver, vm);
     return -1;
 }
 
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index d0b2d40e94..394956a14d 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -883,7 +883,7 @@ qemuSnapshotDiskCleanup(qemuSnapshotDiskData *data,
 
                     qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm),
                                                          data[i].crdata->srcdata[0]);
-                    ignore_value(qemuDomainObjExitMonitor(driver, vm));
+                    qemuDomainObjExitMonitor(driver, vm);
                 }
             }
 
-- 
2.31.1


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[libvirt PATCH 5/7] qemu: remove ignore_value for qemuDomainObjExitMonitor