add --crash support to "virsh dump"

This patch adds the --crash option (already present in "xm dump-core")
to "virsh dump".  virDomainCoreDump already has a flags argument, so
the API/ABI is untouched.

* include/libvirt/libvirt.h.in (virDomainCoreDumpFlags): New flag for
  CoreDump
* src/test/test_driver.c (testDomainCoreDump): Do not crash
  after dump unless VIR_DUMP_CRASH is given.
* src/qemu/qemu_driver.c (qemudDomainCoreDump): Shutdown the domain
  instead of restarting it if --crash is passed.
* src/xen/xend_internal.c (xenDaemonDomainCoreDump): Support --crash.
* tools/virsh.c (opts_dump): Add --crash.
  (cmdDump): Map it to flags for virDomainCoreDump and pass them.

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 0488cbf90da6ef561c466780fceb9d4c2e613ff7..2dd3d06d91f3ea2029ff105e9992bd1d70f6d818 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -334,6 +334,11 @@ struct _virDomainInterfaceStats {
 typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr;
 
 
+/* Domain core dump flags. */
+typedef enum {
+    VIR_DUMP_CRASH   = (1 << 0), /* crash after dump */
+} virDomainCoreDumpFlags;
+
 /* Domain migration flags. */
 typedef enum {
     VIR_MIGRATE_LIVE              = (1 << 0), /* live migration */

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7e55c236f84885960f1ce188baae83b385109fde..34fa582cb116d5a140f55db2b903308b3eb7bf25 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3802,6 +3802,7 @@ static int qemudDomainCoreDump(virDomainPtr dom,
     virDomainObjPtr vm;
     int resume = 0, paused = 0;
     int ret = -1, fd = -1;
+    virDomainEventPtr event = NULL;
     const char *args[] = {
         "cat",
         NULL,
@@ -3892,10 +3893,17 @@ static int qemudDomainCoreDump(virDomainPtr dom,
         goto endjob;
 
 endjob:
+    if ((ret == 0) && (flags & VIR_DUMP_CRASH)) {
+        qemudShutdownVMDaemon(dom->conn, driver, vm);
+        event = virDomainEventNewFromObj(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.  */
-    if (resume && paused) {
+    else if (resume && paused) {
         qemuDomainObjEnterMonitor(vm);
         if (qemuMonitorStartCPUs(priv->mon, dom->conn) < 0) {
             if (virGetLastError() == NULL)
@@ -3907,12 +3915,19 @@ endjob:
 
     if (qemuDomainObjEndJob(vm) == 0)
         vm = NULL;
+    if ((ret == 0) && (flags & VIR_DUMP_CRASH) && !vm->persistent) {
+        virDomainRemoveInactive(&driver->domains,
+                                vm);
+        vm = NULL;
+    }
 
 cleanup:
     if (ret != 0)
         unlink(path);
     if (vm)
         virDomainObjUnlock(vm);
+    if (event)
+        qemuDomainEventQueue(driver, event);
     return ret;
 }
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 35f7571a4d88bc97e4e13d6693de7c5061d2801c..7db9a4c08fcc70aa40cc43ef1baf4fbab214b8a6 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1911,15 +1911,16 @@ static int testDomainCoreDump(virDomainPtr domain,
         goto cleanup;
     }
 
-    testDomainShutdownState(domain, privdom);
-    event = virDomainEventNewFromObj(privdom,
-                                     VIR_DOMAIN_EVENT_STOPPED,
-                                     VIR_DOMAIN_EVENT_STOPPED_CRASHED);
-
-    if (!privdom->persistent) {
-        virDomainRemoveInactive(&privconn->domains,
-                                privdom);
-        privdom = NULL;
+    if (flags & VIR_DUMP_CRASH) {
+        testDomainShutdownState(domain, privdom);
+        event = virDomainEventNewFromObj(privdom,
+                                         VIR_DOMAIN_EVENT_STOPPED,
+                                         VIR_DOMAIN_EVENT_STOPPED_CRASHED);
+        if (!privdom->persistent) {
+            virDomainRemoveInactive(&privconn->domains,
+                                    privdom);
+            privdom = NULL;
+        }
     }
 
     ret = 0;

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index d782a872248564198098d708899ad6978cd32bb6..3ce4dc338ad378e61e8c3fd33523b3cdc565bfb4 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -3253,8 +3253,10 @@ xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
         return(-1);
     }
 
-    return xend_op(domain->conn, domain->name, "op", "dump", "file", filename,
-                   "live", "0", "crash", "0", NULL);
+    return xend_op(domain->conn, domain->name,
+                   "op", "dump", "file", filename, "live", "0",
+                   "crash", (flags & VIR_DUMP_CRASH ? "1" : "0"),
+                   NULL);
 }
 
 /**

diff --git a/tools/virsh.c b/tools/virsh.c
index b8ddaa6beb1c62482dd377ed88602a248f2c06d8..62c127072e32be96dc046c8723c1d7a13950753c 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -1431,6 +1431,7 @@ static const vshCmdInfo info_dump[] = {
 };
 
 static const vshCmdOptDef opts_dump[] = {
+    {"crash", VSH_OT_BOOL, 0, gettext_noop("crash the domain after core dump")},
     {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
     {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("where to dump the core")},
     {NULL, 0, 0, NULL}
@@ -1443,6 +1444,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd)
     char *name;
     char *to;
     int ret = TRUE;
+    int flags = 0;
 
     if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
         return FALSE;
@@ -1453,7 +1455,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd)
     if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
         return FALSE;
 
-    if (virDomainCoreDump(dom, to, 0) == 0) {
+    if (vshCommandOptBool (cmd, "crash"))
+        flags |= VIR_DUMP_CRASH;
+
+    if (virDomainCoreDump(dom, to, flags) == 0) {
         vshPrint(ctl, _("Domain %s dumped to %s\n"), name, to);
     } else {
         vshError(ctl, _("Failed to core dump domain %s to %s"), name, to);