]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuDomainSaveImageStartVM: Use VIR_AUTOCLOSE for @intermediatefd
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 13 Jan 2020 09:07:32 +0000 (10:07 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 16 Jan 2020 08:17:07 +0000 (09:17 +0100)
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
src/qemu/qemu_driver.c

index 57d1103c459f10f6bb2e06c53504ad6ebb4fb07f..e1f8968136799982b28fb12b238ac869ccc2c4b7 100644 (file)
@@ -6803,7 +6803,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
     int ret = -1;
     bool restored = false;
     virObjectEventPtr event;
-    int intermediatefd = -1;
+    VIR_AUTOCLOSE intermediatefd = -1;
     virCommandPtr cmd = NULL;
     g_autofree char *errbuf = NULL;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
@@ -6829,6 +6829,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
 
         if (virCommandRunAsync(cmd, NULL) < 0) {
             *fd = intermediatefd;
+            intermediatefd = -1;
             goto cleanup;
         }
     }
@@ -6872,8 +6873,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
 
         virErrorRestore(&orig_err);
     }
-    VIR_FORCE_CLOSE(intermediatefd);
-
     if (VIR_CLOSE(*fd) < 0) {
         virReportSystemError(errno, _("cannot close file: %s"), path);
         restored = false;