]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Remove useless block in processWatchdogEvent
authorMartin Kletzander <mkletzan@redhat.com>
Thu, 16 Jun 2016 15:05:07 +0000 (17:05 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Thu, 16 Jun 2016 16:07:43 +0000 (18:07 +0200)
Best viewed with -w since this is mostly just an indentation patch.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/qemu/qemu_driver.c

index 8a3e61c96f117031d5decd7d733cc38b0745a035..28859366ee3251be720e3e2fc7f3d0840157d1a5 100644 (file)
@@ -3938,42 +3938,39 @@ processWatchdogEvent(virQEMUDriverPtr driver,
     int ret;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
     char *dumpfile = getAutoDumpPath(driver, vm);
+    unsigned int flags = VIR_DUMP_MEMORY_ONLY;
 
     if (!dumpfile)
         goto cleanup;
 
     switch (action) {
     case VIR_DOMAIN_WATCHDOG_ACTION_DUMP:
-        {
-            unsigned int flags = VIR_DUMP_MEMORY_ONLY;
-
-            if (qemuDomainObjBeginAsyncJob(driver, vm,
-                                           QEMU_ASYNC_JOB_DUMP) < 0) {
-                goto cleanup;
-            }
+        if (qemuDomainObjBeginAsyncJob(driver, vm,
+                                       QEMU_ASYNC_JOB_DUMP) < 0) {
+            goto cleanup;
+        }
 
-            if (!virDomainObjIsActive(vm)) {
-                virReportError(VIR_ERR_OPERATION_INVALID,
-                               "%s", _("domain is not running"));
-                goto endjob;
-            }
+        if (!virDomainObjIsActive(vm)) {
+            virReportError(VIR_ERR_OPERATION_INVALID,
+                           "%s", _("domain is not running"));
+            goto endjob;
+        }
 
-            flags |= cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0;
-            ret = doCoreDump(driver, vm, dumpfile,
-                             getCompressionType(driver), flags,
-                             VIR_DOMAIN_CORE_DUMP_FORMAT_RAW);
-            if (ret < 0)
-                virReportError(VIR_ERR_OPERATION_FAILED,
-                               "%s", _("Dump failed"));
+        flags |= cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0;
+        ret = doCoreDump(driver, vm, dumpfile,
+                         getCompressionType(driver), flags,
+                         VIR_DOMAIN_CORE_DUMP_FORMAT_RAW);
+        if (ret < 0)
+            virReportError(VIR_ERR_OPERATION_FAILED,
+                           "%s", _("Dump failed"));
 
-            ret = qemuProcessStartCPUs(driver, vm, NULL,
-                                       VIR_DOMAIN_RUNNING_UNPAUSED,
-                                       QEMU_ASYNC_JOB_DUMP);
+        ret = qemuProcessStartCPUs(driver, vm, NULL,
+                                   VIR_DOMAIN_RUNNING_UNPAUSED,
+                                   QEMU_ASYNC_JOB_DUMP);
 
-            if (ret < 0)
-                virReportError(VIR_ERR_OPERATION_FAILED,
-                               "%s", _("Resuming after dump failed"));
-        }
+        if (ret < 0)
+            virReportError(VIR_ERR_OPERATION_FAILED,
+                           "%s", _("Resuming after dump failed"));
         break;
     default:
         goto cleanup;