]> xenbits.xensource.com Git - libvirt.git/commitdiff
virLXCProcessReboot: Simplify cleanup
authorPeter Krempa <pkrempa@redhat.com>
Tue, 28 Jun 2022 14:32:12 +0000 (16:32 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 22 Jul 2022 09:11:42 +0000 (11:11 +0200)
Remove the pointless 'cleanup' section and 'ret' variable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
src/lxc/lxc_process.c

index 4934a96e0cf6a9bd26c1d6a5f3295bb8f2544991..130c16aa04b41635de35d11ede99fd18b4e84bc1 100644 (file)
@@ -89,7 +89,6 @@ virLXCProcessReboot(virLXCDriver *driver,
 {
     g_autoptr(virConnect) autoDestroyConn = virCloseCallbacksGetConn(driver->closeCallbacks, vm);
     int reason = vm->state.reason;
-    int ret = -1;
     virDomainDef *savedDef;
 
     VIR_DEBUG("Faking reboot");
@@ -105,15 +104,11 @@ virLXCProcessReboot(virLXCDriver *driver,
     virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, 0);
     vm->newDef = savedDef;
     if (virLXCProcessStart(driver, vm, 0, NULL, autoDestroyConn, reason) < 0) {
-        VIR_WARN("Unable to handle reboot of vm %s",
-                 vm->def->name);
-        goto cleanup;
+        VIR_WARN("Unable to handle reboot of vm %s", vm->def->name);
+        return -1;
     }
 
-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 }