Update documentation of watchdog dump option and add test data for it

The xml watchdog dump option is converted to qemu watchdog pause arg
but it is not reasonable to convert it back from qemu watchdog pause
arg since there already is a xml watchdog pause option, so a test for
the dump option to convert it from arg to xml is not added.

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 8db8b52b25bacdeeb64b6f4fe0ca9eaa7d23bb68..cfd3451800093ea9108414a8ed8587b1cdd63c1d 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1687,14 +1687,20 @@ qemu-kvm -net nic,model=? /dev/null
           <li>'poweroff' &mdash; forcefully power off the guest</li>
           <li>'pause' &mdash; pause the guest</li>
           <li>'none' &mdash; do nothing</li>
+          <li>'dump' &mdash; automatically dump the guest
+            <span class="since">Since 0.8.7</span></li>
         </ul>
         <p>
-        Note that the 'shutdown' action requires that the guest
+        Note 1: the 'shutdown' action requires that the guest
         is responsive to ACPI signals.  In the sort of situations
         where the watchdog has expired, guests are usually unable
         to respond to ACPI signals.  Therefore using 'shutdown'
         is not recommended.
         </p>
+        <p>
+        Note 2: the directory to save dump files can be configured
+        by <code>auto_dump_path</code> in file /etc/libvirt/qemu.conf.
+        </p>
       </dd>
     </dl>
 

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 51aae14791b210768be05f645fd887eba55efbfb..eee98641063f9af5132e88fbecd65b1f13da3cb6 100644 (file)
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -1505,6 +1505,7 @@
             <value>poweroff</value>
             <value>pause</value>
             <value>none</value>
+            <value>dump</value>
           </choice>
         </attribute>
       </optional>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
new file mode 100644 (file)
index 0000000..50b26f8
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
@@ -0,0 +1 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -watchdog ib700 -watchdog-action pause

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml
new file mode 100644 (file)
index 0000000..4314ec4
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml
@@ -0,0 +1,26 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory>219200</memory>
+  <currentMemory>219200</currentMemory>
+  <vcpu>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' unit='0'/>
+    </disk>
+    <controller type='ide' index='0'/>
+    <watchdog model='ib700' action='dump'/>
+    <memballoon model='virtio'/>
+  </devices>
+</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e1f4e04b21cc3a5cc2569a69dd8569a27b8f2972..db2d00657f79436aeb3387c1f2501e02ba388e3d 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -405,6 +405,7 @@ mymain(int argc, char **argv)
     DO_TEST("watchdog", 0, false);
     DO_TEST("watchdog-device", QEMUD_CMD_FLAG_DEVICE |
             QEMUD_CMD_FLAG_NODEFCONFIG, false);
+    DO_TEST("watchdog-dump", 0, false);
     DO_TEST("balloon-device", QEMUD_CMD_FLAG_DEVICE |
             QEMUD_CMD_FLAG_NODEFCONFIG, false);
     DO_TEST("balloon-device-auto", QEMUD_CMD_FLAG_DEVICE |