[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/4] qemu: dump: Fix formatting of function headers and code inline



Also drop a comment with obvious content.
---
 src/qemu/qemu_driver.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d724eeb..f0e8994 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3607,10 +3607,12 @@ getCompressionType(virQEMUDriverPtr driver)
     return ret;
 }

-static int qemuDomainCoreDumpWithFormat(virDomainPtr dom,
-                                        const char *path,
-                                        unsigned int dumpformat,
-                                        unsigned int flags)
+
+static int
+qemuDomainCoreDumpWithFormat(virDomainPtr dom,
+                             const char *path,
+                             unsigned int dumpformat,
+                             unsigned int flags)
 {
     virQEMUDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm;
@@ -3672,13 +3674,8 @@ static int qemuDomainCoreDumpWithFormat(virDomainPtr dom,
         event = virDomainEventLifecycleNewFromObj(vm,
                                          VIR_DOMAIN_EVENT_STOPPED,
                                          VIR_DOMAIN_EVENT_STOPPED_CRASHED);
-    }
-
-    /* Since the monitor is always attached to a pty for libvirt, it
-       will support synchronous operations so we always get here after
-       the migration is complete.  */
-    else if (((resume && paused) || (flags & VIR_DUMP_RESET)) &&
-             virDomainObjIsActive(vm)) {
+    } else if (((resume && paused) || (flags & VIR_DUMP_RESET)) &&
+               virDomainObjIsActive(vm)) {
         if ((ret == 0) && (flags & VIR_DUMP_RESET)) {
             priv =  vm->privateData;
             qemuDomainObjEnterMonitor(driver, vm);
@@ -3713,14 +3710,18 @@ static int qemuDomainCoreDumpWithFormat(virDomainPtr dom,
     return ret;
 }

-static int qemuDomainCoreDump(virDomainPtr dom,
-                              const char *path,
-                              unsigned int flags)
+
+static int
+qemuDomainCoreDump(virDomainPtr dom,
+                   const char *path,
+                   unsigned int flags)
 {
     return qemuDomainCoreDumpWithFormat(dom, path,
-                                        VIR_DOMAIN_CORE_DUMP_FORMAT_RAW, flags);
+                                        VIR_DOMAIN_CORE_DUMP_FORMAT_RAW,
+                                        flags);
 }

+
 static char *
 qemuDomainScreenshot(virDomainPtr dom,
                      virStreamPtr st,
-- 
2.0.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]