]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_process.c: remove 'cleanup' label from qemuProcessCreatePretendCmd()
authorDaniel Henrique Barboza <danielhb413@gmail.com>
Fri, 20 Dec 2019 21:16:32 +0000 (18:16 -0300)
committerCole Robinson <crobinso@redhat.com>
Fri, 20 Dec 2019 23:31:51 +0000 (18:31 -0500)
The 'cleanup' flag is doing no cleaup in this function. We can
remove it and return NULL on error or qemuBuildCommandLine().

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
src/qemu/qemu_process.c

index 3abe86ed2aab655b8b9d15626b30e6320f7bbdcf..e5f027f3a66be07a84ff40be9019ad46405531c3 100644 (file)
@@ -7148,11 +7148,9 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
                             bool standalone,
                             unsigned int flags)
 {
-    virCommandPtr cmd = NULL;
-
-    virCheckFlagsGoto(VIR_QEMU_PROCESS_START_COLD |
-                      VIR_QEMU_PROCESS_START_PAUSED |
-                      VIR_QEMU_PROCESS_START_AUTODESTROY, cleanup);
+    virCheckFlags(VIR_QEMU_PROCESS_START_COLD |
+                  VIR_QEMU_PROCESS_START_PAUSED |
+                  VIR_QEMU_PROCESS_START_AUTODESTROY, NULL);
 
     flags |= VIR_QEMU_PROCESS_START_PRETEND;
     flags |= VIR_QEMU_PROCESS_START_NEW;
@@ -7161,26 +7159,23 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
 
     if (qemuProcessInit(driver, vm, NULL, QEMU_ASYNC_JOB_NONE,
                         !!migrateURI, flags) < 0)
-        goto cleanup;
+        return NULL;
 
     if (qemuProcessPrepareDomain(driver, vm, flags) < 0)
-        goto cleanup;
+        return NULL;
 
     VIR_DEBUG("Building emulator command line");
-    cmd = qemuBuildCommandLine(driver,
-                               NULL,
-                               driver->securityManager,
-                               vm,
-                               migrateURI,
-                               NULL,
-                               VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
-                               standalone,
-                               enableFips,
-                               NULL,
-                               NULL);
-
- cleanup:
-    return cmd;
+    return qemuBuildCommandLine(driver,
+                                NULL,
+                                driver->securityManager,
+                                vm,
+                                migrateURI,
+                                NULL,
+                                VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
+                                standalone,
+                                enableFips,
+                                NULL,
+                                NULL);
 }