[virt-tools-list] [PATCH v3 3/6] Update tests because we use destroy as a default action for on_crash

Mikhail Feoktistov mfeoktistov at virtuozzo.com
Tue Feb 21 14:27:57 UTC 2017


---
 tests/cli-test-xml/clone-disk-noexist.xml                    |  2 +-
 tests/cli-test-xml/compare/virt-clone-clone-auto1.xml        |  2 +-
 tests/cli-test-xml/compare/virt-clone-clone-auto2.xml        |  2 +-
 tests/cli-test-xml/compare/virt-convert-ovf-compare.xml      |  2 +-
 tests/cli-test-xml/compare/virt-convert-vmx-compare.xml      |  2 +-
 tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml    |  2 +-
 tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml  |  2 +-
 .../cli-test-xml/compare/virt-install-aarch64-kvm-import.xml |  2 +-
 .../compare/virt-install-aarch64-machdefault.xml             |  2 +-
 tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml |  2 +-
 .../compare/virt-install-arm-defaultmach-f20.xml             |  2 +-
 tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml   |  2 +-
 tests/cli-test-xml/compare/virt-install-arm-vexpress-f19.xml |  2 +-
 .../cli-test-xml/compare/virt-install-arm-vexpress-plain.xml |  2 +-
 tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml     |  2 +-
 tests/cli-test-xml/compare/virt-install-cpuset-auto.xml      |  2 +-
 tests/cli-test-xml/compare/virt-install-default.xml          |  2 +-
 tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml   |  2 +-
 tests/cli-test-xml/compare/virt-install-fs-default.xml       |  2 +-
 tests/cli-test-xml/compare/virt-install-kvm-centos7.xml      |  2 +-
 tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml      |  2 +-
 tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml        |  2 +-
 tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml        |  2 +-
 .../compare/virt-install-kvm-session-defaults.xml            |  2 +-
 tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml |  2 +-
 tests/cli-test-xml/compare/virt-install-location-iso.xml     |  2 +-
 tests/cli-test-xml/compare/virt-install-manual-init.xml      |  2 +-
 tests/cli-test-xml/compare/virt-install-many-devices.xml     |  2 +-
 .../compare/virt-install-ppc64-machdefault-f20.xml           |  2 +-
 .../cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml  |  2 +-
 .../cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml |  2 +-
 tests/cli-test-xml/compare/virt-install-q35-defaults.xml     |  2 +-
 tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml    |  2 +-
 tests/cli-test-xml/compare/virt-install-qemu-plain.xml       |  2 +-
 tests/cli-test-xml/compare/virt-install-simple-pxe.xml       |  2 +-
 .../cli-test-xml/compare/virt-install-singleton-config-2.xml |  2 +-
 .../cli-test-xml/compare/virt-install-solaris10-defaults.xml |  2 +-
 tests/cli-test-xml/compare/virt-install-spice-gl.xml         |  2 +-
 tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml       |  2 +-
 tests/cli-test-xml/compare/virt-install-win7-uefi.xml        |  2 +-
 tests/cli-test-xml/compare/virt-install-xen-default.xml      |  2 +-
 tests/cli-test-xml/compare/virt-install-xen-hvm.xml          |  2 +-
 tests/cli-test-xml/compare/virt-install-xen-pv.xml           |  2 +-
 tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml   |  2 +-
 tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml       |  2 +-
 tests/clone-xml/fullpool-in.xml                              |  2 +-
 tests/testdriver.xml                                         | 12 ++++++------
 .../libvirt_output/ovf2libvirt_ovf_directory.libvirt         |  2 +-
 .../virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt  |  2 +-
 .../libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2      |  2 +-
 .../virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt  |  2 +-
 .../libvirt_output/ovf2libvirt_test_gzip.libvirt             |  2 +-
 .../libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw    |  2 +-
 .../libvirt_output/vmx2libvirt_test-nodisks.libvirt          |  2 +-
 .../libvirt_output/vmx2libvirt_test-vmx-zip.libvirt          |  2 +-
 .../virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt  |  2 +-
 .../libvirt_output/vmx2libvirt_test1.libvirt.disk_raw        |  2 +-
 .../libvirt_output/vmx2libvirt_vmx-dir.libvirt               |  2 +-
 tests/xmlconfig-xml/install-f11-norheldefaults.xml           |  2 +-
 tests/xmlconfig-xml/install-f11-rheldefaults.xml             |  2 +-
 tests/xmlparse-xml/add-devices-in.xml                        |  2 +-
 tests/xmlparse-xml/add-devices-out.xml                       |  2 +-
 tests/xmlparse-xml/change-addr-in.xml                        |  2 +-
 tests/xmlparse-xml/change-addr-out.xml                       |  2 +-
 tests/xmlparse-xml/change-boot-multi-in.xml                  |  2 +-
 tests/xmlparse-xml/change-boot-multi-out.xml                 |  2 +-
 tests/xmlparse-xml/change-chars-in.xml                       |  2 +-
 tests/xmlparse-xml/change-chars-out.xml                      |  2 +-
 tests/xmlparse-xml/change-controllers-in.xml                 |  2 +-
 tests/xmlparse-xml/change-controllers-out.xml                |  2 +-
 tests/xmlparse-xml/change-disk-in.xml                        |  2 +-
 tests/xmlparse-xml/change-disk-out.xml                       |  2 +-
 tests/xmlparse-xml/change-filesystems-in.xml                 |  2 +-
 tests/xmlparse-xml/change-filesystems-out.xml                |  2 +-
 tests/xmlparse-xml/change-graphics-in.xml                    |  2 +-
 tests/xmlparse-xml/change-graphics-out.xml                   |  2 +-
 tests/xmlparse-xml/change-guest-in.xml                       |  2 +-
 tests/xmlparse-xml/change-guest-out.xml                      |  2 +-
 tests/xmlparse-xml/change-hostdevs-in.xml                    |  2 +-
 tests/xmlparse-xml/change-hostdevs-out.xml                   |  2 +-
 tests/xmlparse-xml/change-inputs-in.xml                      |  2 +-
 tests/xmlparse-xml/change-inputs-out.xml                     |  2 +-
 tests/xmlparse-xml/change-nics-in.xml                        |  2 +-
 tests/xmlparse-xml/change-nics-out.xml                       |  2 +-
 tests/xmlparse-xml/change-panic-device-in.xml                |  2 +-
 tests/xmlparse-xml/change-panic-device-out.xml               |  2 +-
 tests/xmlparse-xml/change-redirdev-in.xml                    |  2 +-
 tests/xmlparse-xml/change-redirdev-out.xml                   |  2 +-
 tests/xmlparse-xml/change-rng-egd-in.xml                     |  2 +-
 tests/xmlparse-xml/change-rng-egd-out.xml                    |  2 +-
 tests/xmlparse-xml/change-rng-random-in.xml                  |  2 +-
 tests/xmlparse-xml/change-rng-random-out.xml                 |  2 +-
 tests/xmlparse-xml/change-smartcard-in.xml                   |  2 +-
 tests/xmlparse-xml/change-smartcard-out.xml                  |  2 +-
 tests/xmlparse-xml/change-sounds-in.xml                      |  2 +-
 tests/xmlparse-xml/change-sounds-out.xml                     |  2 +-
 tests/xmlparse-xml/change-tpm-in.xml                         |  2 +-
 tests/xmlparse-xml/change-tpm-out.xml                        |  2 +-
 tests/xmlparse-xml/change-videos-in.xml                      |  2 +-
 tests/xmlparse-xml/change-videos-out.xml                     |  2 +-
 tests/xmlparse-xml/change-watchdogs-in.xml                   |  2 +-
 tests/xmlparse-xml/change-watchdogs-out.xml                  |  2 +-
 tests/xmlparse.py                                            |  2 +-
 103 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/tests/cli-test-xml/clone-disk-noexist.xml b/tests/cli-test-xml/clone-disk-noexist.xml
index 88ced6f..d99b1ae 100644
--- a/tests/cli-test-xml/clone-disk-noexist.xml
+++ b/tests/cli-test-xml/clone-disk-noexist.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
index 735d87b..6bdb82e 100644
--- a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
+++ b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml
@@ -16,7 +16,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type="block" device="floppy">
diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
index af8c7aa..d8abf10 100644
--- a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
+++ b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml
@@ -16,7 +16,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
index eb8e131..8934d63 100644
--- a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
+++ b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
@@ -24,7 +24,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
index 9ef61fb..f3f81a8 100644
--- a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
+++ b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
index 22b499b..ee934aa 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>restart</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
+  <on_crash>preserve</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
index 5bf4144..e3268c6 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
@@ -16,7 +16,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
index 8c20077..3ae21ea 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
@@ -13,7 +13,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml b/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
index 231cb34..b9037ee 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
@@ -16,7 +16,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml b/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
index 231cb34..b9037ee 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
@@ -16,7 +16,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
index 6796a20..6020ef7 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
@@ -13,7 +13,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
index 5bc71dd..1c635de 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
@@ -12,7 +12,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-arm-vexpress-f19.xml b/tests/cli-test-xml/compare/virt-install-arm-vexpress-f19.xml
index 4569e69..7749ec1 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-vexpress-f19.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-vexpress-f19.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml b/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
index 59f441c..e22fa8f 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
index 01ba6e9..ebbf1a4 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
@@ -13,7 +13,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml b/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
index 452b3c0..ba7d9e4 100644
--- a/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
+++ b/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
@@ -54,7 +54,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-default.xml b/tests/cli-test-xml/compare/virt-install-default.xml
index 0d29881..20af0ff 100644
--- a/tests/cli-test-xml/compare/virt-install-default.xml
+++ b/tests/cli-test-xml/compare/virt-install-default.xml
@@ -10,7 +10,7 @@
   </os>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/libexec/libvirt_lxc</emulator>
     <interface type="bridge">
diff --git a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
index f8eafbf..671c393 100644
--- a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-disk enabled="yes"/>
     <suspend-to-mem enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-fs-default.xml b/tests/cli-test-xml/compare/virt-install-fs-default.xml
index 1f7b645..b4f0d96 100644
--- a/tests/cli-test-xml/compare/virt-install-fs-default.xml
+++ b/tests/cli-test-xml/compare/virt-install-fs-default.xml
@@ -13,7 +13,7 @@
   </features>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/libexec/libvirt_lxc</emulator>
     <filesystem>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
index e05fadb..1b47b64 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
@@ -96,7 +96,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml b/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
index 76397ff..c331bbe 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
@@ -82,7 +82,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
index e05fadb..1b47b64 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
@@ -96,7 +96,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
index e05fadb..1b47b64 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
@@ -96,7 +96,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
index ea95cf0..0069808 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
@@ -101,7 +101,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
index 869634f..22675c4 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
@@ -100,7 +100,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-location-iso.xml b/tests/cli-test-xml/compare/virt-install-location-iso.xml
index d9c38af..12c5e63 100644
--- a/tests/cli-test-xml/compare/virt-install-location-iso.xml
+++ b/tests/cli-test-xml/compare/virt-install-location-iso.xml
@@ -88,7 +88,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-manual-init.xml b/tests/cli-test-xml/compare/virt-install-manual-init.xml
index 5ac2bb7..a5df1b7 100644
--- a/tests/cli-test-xml/compare/virt-install-manual-init.xml
+++ b/tests/cli-test-xml/compare/virt-install-manual-init.xml
@@ -10,7 +10,7 @@
   </os>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/libexec/libvirt_lxc</emulator>
     <interface type="bridge">
diff --git a/tests/cli-test-xml/compare/virt-install-many-devices.xml b/tests/cli-test-xml/compare/virt-install-many-devices.xml
index baa2114..1a29e77 100644
--- a/tests/cli-test-xml/compare/virt-install-many-devices.xml
+++ b/tests/cli-test-xml/compare/virt-install-many-devices.xml
@@ -22,7 +22,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
index 4c5e858..30aa7a1 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
@@ -11,7 +11,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
index b650f43..3ccc5f5 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
@@ -11,7 +11,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
index f7e3b67..7636092 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
@@ -11,7 +11,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
index ebf8b0a..64a695e 100644
--- a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
@@ -97,7 +97,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
index 8a6e328..234cd29 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
@@ -20,7 +20,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
index 5978184..cd1e3fd 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-simple-pxe.xml b/tests/cli-test-xml/compare/virt-install-simple-pxe.xml
index c0a4b52..2275d63 100644
--- a/tests/cli-test-xml/compare/virt-install-simple-pxe.xml
+++ b/tests/cli-test-xml/compare/virt-install-simple-pxe.xml
@@ -54,7 +54,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
index 3d243bc..f2e00e9 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
@@ -75,7 +75,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
+  <on_crash>preserve</on_crash>
   <resource>
     <partition>/virtualmachines/production</partition>
   </resource>
diff --git a/tests/cli-test-xml/compare/virt-install-solaris10-defaults.xml b/tests/cli-test-xml/compare/virt-install-solaris10-defaults.xml
index 9f7f05c..6b7e831 100644
--- a/tests/cli-test-xml/compare/virt-install-solaris10-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-solaris10-defaults.xml
@@ -24,7 +24,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-spice-gl.xml b/tests/cli-test-xml/compare/virt-install-spice-gl.xml
index 44a6700..65f2bbb 100644
--- a/tests/cli-test-xml/compare/virt-install-spice-gl.xml
+++ b/tests/cli-test-xml/compare/virt-install-spice-gl.xml
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml b/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
index ac281c5..613298a 100644
--- a/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
@@ -71,7 +71,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
index 8d98056..48faded 100644
--- a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
+++ b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
@@ -101,7 +101,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-install-xen-default.xml b/tests/cli-test-xml/compare/virt-install-xen-default.xml
index a9054a6..2fc7f8a 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-default.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-default.xml
@@ -7,7 +7,7 @@
   <bootloader>/usr/bin/pygrub</bootloader>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
diff --git a/tests/cli-test-xml/compare/virt-install-xen-hvm.xml b/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
index 59c9daf..e9d4555 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
@@ -18,7 +18,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type="block" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-xen-pv.xml b/tests/cli-test-xml/compare/virt-install-xen-pv.xml
index fd886a4..33a3263 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-pv.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-pv.xml
@@ -37,7 +37,7 @@
   <bootloader>/usr/bin/pygrub</bootloader>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml
index 6e9b82d..92f0815 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml
@@ -1,7 +1,7 @@
    </clock>
    <on_poweroff>destroy</on_poweroff>
    <on_reboot>restart</on_reboot>
--  <on_crash>restart</on_crash>
+-  <on_crash>destroy</on_crash>
 +  <on_crash>preserve</on_crash>
    <pm>
      <suspend-to-mem enabled="no"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml
index ee06581..9d5c788 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml
@@ -1,5 +1,5 @@
    <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
+   <on_crash>destroy</on_crash>
    <pm>
 -    <suspend-to-mem enabled="no"/>
 +    <suspend-to-mem enabled="yes"/>
diff --git a/tests/clone-xml/fullpool-in.xml b/tests/clone-xml/fullpool-in.xml
index 3ea1584..9b5cc47 100644
--- a/tests/clone-xml/fullpool-in.xml
+++ b/tests/clone-xml/fullpool-in.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/testdriver.xml b/tests/testdriver.xml
index c5cdac9..388f9fa 100644
--- a/tests/testdriver.xml
+++ b/tests/testdriver.xml
@@ -96,7 +96,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1,2,5-9,11,13-14">9</vcpu>
   <numatune>
     <memory mode='interleave' placement='auto'/>
@@ -331,7 +331,7 @@ Foo bar baz & yeah boii < > yeahfoo
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1,2,5-9,11,13-14">9</vcpu>
   <numatune>
     <memory mode='interleave' placement='auto'/>
@@ -780,7 +780,7 @@ test-many-devices, like an alternate RNG.
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
@@ -815,7 +815,7 @@ test-many-devices, like an alternate RNG.
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
@@ -882,7 +882,7 @@ test-many-devices, like an alternate RNG.
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
@@ -917,7 +917,7 @@ test-many-devices, like an alternate RNG.
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
index ec4e165..c3d17bd 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
index b527bfa..d15e322 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
@@ -24,7 +24,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2 b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
index 9d09a99..a636d0a 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
@@ -24,7 +24,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
index 8376dff..bfbc395 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
@@ -24,7 +24,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt
index 41b14cc..9f451c4 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw b/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw
index 26978a6..8fb5580 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
index 2f6b621..f5b6334 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
index b13662c..8019e61 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
@@ -24,7 +24,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
index 1357a5f..5d9e837 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
index c4ca5a6..5a5b572 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
@@ -23,7 +23,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
index c65a168..516893f 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
@@ -24,7 +24,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
diff --git a/tests/xmlconfig-xml/install-f11-norheldefaults.xml b/tests/xmlconfig-xml/install-f11-norheldefaults.xml
index 889c320..8c54834 100644
--- a/tests/xmlconfig-xml/install-f11-norheldefaults.xml
+++ b/tests/xmlconfig-xml/install-f11-norheldefaults.xml
@@ -19,7 +19,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type="file" device="floppy">
diff --git a/tests/xmlconfig-xml/install-f11-rheldefaults.xml b/tests/xmlconfig-xml/install-f11-rheldefaults.xml
index d6c094b..ead9ef8 100644
--- a/tests/xmlconfig-xml/install-f11-rheldefaults.xml
+++ b/tests/xmlconfig-xml/install-f11-rheldefaults.xml
@@ -19,7 +19,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <disk type="file" device="floppy">
diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/xmlparse-xml/add-devices-in.xml
index 97b7822..9534e93 100644
--- a/tests/xmlparse-xml/add-devices-in.xml
+++ b/tests/xmlparse-xml/add-devices-in.xml
@@ -13,7 +13,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1-3">5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/add-devices-out.xml b/tests/xmlparse-xml/add-devices-out.xml
index a44471b..e7e153b 100644
--- a/tests/xmlparse-xml/add-devices-out.xml
+++ b/tests/xmlparse-xml/add-devices-out.xml
@@ -13,7 +13,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1-3">5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-addr-in.xml b/tests/xmlparse-xml/change-addr-in.xml
index 254d9d2..0e737b9 100644
--- a/tests/xmlparse-xml/change-addr-in.xml
+++ b/tests/xmlparse-xml/change-addr-in.xml
@@ -13,7 +13,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type='block' device='disk'>
diff --git a/tests/xmlparse-xml/change-addr-out.xml b/tests/xmlparse-xml/change-addr-out.xml
index d3c644e..5f7b261 100644
--- a/tests/xmlparse-xml/change-addr-out.xml
+++ b/tests/xmlparse-xml/change-addr-out.xml
@@ -13,7 +13,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type="block" device="disk">
diff --git a/tests/xmlparse-xml/change-boot-multi-in.xml b/tests/xmlparse-xml/change-boot-multi-in.xml
index 58e39c0..6ce7bfe 100644
--- a/tests/xmlparse-xml/change-boot-multi-in.xml
+++ b/tests/xmlparse-xml/change-boot-multi-in.xml
@@ -18,7 +18,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-boot-multi-out.xml b/tests/xmlparse-xml/change-boot-multi-out.xml
index 09bf5d6..12ec8c5 100644
--- a/tests/xmlparse-xml/change-boot-multi-out.xml
+++ b/tests/xmlparse-xml/change-boot-multi-out.xml
@@ -19,7 +19,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-chars-in.xml b/tests/xmlparse-xml/change-chars-in.xml
index ceee29e..98d7162 100644
--- a/tests/xmlparse-xml/change-chars-in.xml
+++ b/tests/xmlparse-xml/change-chars-in.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-chars-out.xml b/tests/xmlparse-xml/change-chars-out.xml
index 119d121..4c75ef3 100644
--- a/tests/xmlparse-xml/change-chars-out.xml
+++ b/tests/xmlparse-xml/change-chars-out.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-controllers-in.xml b/tests/xmlparse-xml/change-controllers-in.xml
index 525e775..4fe1c1c 100644
--- a/tests/xmlparse-xml/change-controllers-in.xml
+++ b/tests/xmlparse-xml/change-controllers-in.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-controllers-out.xml b/tests/xmlparse-xml/change-controllers-out.xml
index ecd0b2d..64d4541 100644
--- a/tests/xmlparse-xml/change-controllers-out.xml
+++ b/tests/xmlparse-xml/change-controllers-out.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-disk-in.xml b/tests/xmlparse-xml/change-disk-in.xml
index 22896ad..0157dc6 100644
--- a/tests/xmlparse-xml/change-disk-in.xml
+++ b/tests/xmlparse-xml/change-disk-in.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml
index cc5eede..0a7833e 100644
--- a/tests/xmlparse-xml/change-disk-out.xml
+++ b/tests/xmlparse-xml/change-disk-out.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-filesystems-in.xml b/tests/xmlparse-xml/change-filesystems-in.xml
index 5cb8010..e622b96 100644
--- a/tests/xmlparse-xml/change-filesystems-in.xml
+++ b/tests/xmlparse-xml/change-filesystems-in.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-filesystems-out.xml b/tests/xmlparse-xml/change-filesystems-out.xml
index 90fcf27..1af7544 100644
--- a/tests/xmlparse-xml/change-filesystems-out.xml
+++ b/tests/xmlparse-xml/change-filesystems-out.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-graphics-in.xml b/tests/xmlparse-xml/change-graphics-in.xml
index b39858c..28c243b 100644
--- a/tests/xmlparse-xml/change-graphics-in.xml
+++ b/tests/xmlparse-xml/change-graphics-in.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-graphics-out.xml b/tests/xmlparse-xml/change-graphics-out.xml
index 0c08458..d51e0d9 100644
--- a/tests/xmlparse-xml/change-graphics-out.xml
+++ b/tests/xmlparse-xml/change-graphics-out.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml
index 15e4d59..0b17044 100644
--- a/tests/xmlparse-xml/change-guest-in.xml
+++ b/tests/xmlparse-xml/change-guest-in.xml
@@ -33,7 +33,7 @@
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <on_lockfailure>poweroff</on_lockfailure>
   <pm>
     <suspend-to-mem enabled='no'/>
diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml
index 9d95666..8b27b18 100644
--- a/tests/xmlparse-xml/change-guest-out.xml
+++ b/tests/xmlparse-xml/change-guest-out.xml
@@ -44,7 +44,7 @@
   </clock>
   <on_poweroff>restart</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
+  <on_crash>restart</on_crash>
   <on_lockfailure>restart</on_lockfailure>
   <pm>
     <suspend-to-mem enabled="yes"/>
diff --git a/tests/xmlparse-xml/change-hostdevs-in.xml b/tests/xmlparse-xml/change-hostdevs-in.xml
index 6c33751..76b8a3a 100644
--- a/tests/xmlparse-xml/change-hostdevs-in.xml
+++ b/tests/xmlparse-xml/change-hostdevs-in.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-hostdevs-out.xml b/tests/xmlparse-xml/change-hostdevs-out.xml
index 8370a5d..660d0fc 100644
--- a/tests/xmlparse-xml/change-hostdevs-out.xml
+++ b/tests/xmlparse-xml/change-hostdevs-out.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-inputs-in.xml b/tests/xmlparse-xml/change-inputs-in.xml
index 8ee938f..94a357c 100644
--- a/tests/xmlparse-xml/change-inputs-in.xml
+++ b/tests/xmlparse-xml/change-inputs-in.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-inputs-out.xml b/tests/xmlparse-xml/change-inputs-out.xml
index 5763c53..d64d710 100644
--- a/tests/xmlparse-xml/change-inputs-out.xml
+++ b/tests/xmlparse-xml/change-inputs-out.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-nics-in.xml b/tests/xmlparse-xml/change-nics-in.xml
index 7e16847..f27ae04 100644
--- a/tests/xmlparse-xml/change-nics-in.xml
+++ b/tests/xmlparse-xml/change-nics-in.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-nics-out.xml b/tests/xmlparse-xml/change-nics-out.xml
index 0dd8e5a..cd8e8be 100644
--- a/tests/xmlparse-xml/change-nics-out.xml
+++ b/tests/xmlparse-xml/change-nics-out.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-panic-device-in.xml b/tests/xmlparse-xml/change-panic-device-in.xml
index 052723a..a18c5d8 100644
--- a/tests/xmlparse-xml/change-panic-device-in.xml
+++ b/tests/xmlparse-xml/change-panic-device-in.xml
@@ -16,7 +16,7 @@
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/local/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
diff --git a/tests/xmlparse-xml/change-panic-device-out.xml b/tests/xmlparse-xml/change-panic-device-out.xml
index 7aa732c..ac94f5b 100644
--- a/tests/xmlparse-xml/change-panic-device-out.xml
+++ b/tests/xmlparse-xml/change-panic-device-out.xml
@@ -16,7 +16,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/local/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
diff --git a/tests/xmlparse-xml/change-redirdev-in.xml b/tests/xmlparse-xml/change-redirdev-in.xml
index 9c0bb86..4922466 100644
--- a/tests/xmlparse-xml/change-redirdev-in.xml
+++ b/tests/xmlparse-xml/change-redirdev-in.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/local/bin/qemu-kvm</emulator>
     <controller type="usb" index="1" model="ich9-ehci1">
diff --git a/tests/xmlparse-xml/change-redirdev-out.xml b/tests/xmlparse-xml/change-redirdev-out.xml
index bf9e041..355db52 100644
--- a/tests/xmlparse-xml/change-redirdev-out.xml
+++ b/tests/xmlparse-xml/change-redirdev-out.xml
@@ -14,7 +14,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/local/bin/qemu-kvm</emulator>
     <controller type="usb" index="1" model="ich9-ehci1">
diff --git a/tests/xmlparse-xml/change-rng-egd-in.xml b/tests/xmlparse-xml/change-rng-egd-in.xml
index 621c07a..d92743b 100644
--- a/tests/xmlparse-xml/change-rng-egd-in.xml
+++ b/tests/xmlparse-xml/change-rng-egd-in.xml
@@ -20,7 +20,7 @@
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset='1-3'>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-rng-egd-out.xml b/tests/xmlparse-xml/change-rng-egd-out.xml
index 88e63e8..30df6bd 100644
--- a/tests/xmlparse-xml/change-rng-egd-out.xml
+++ b/tests/xmlparse-xml/change-rng-egd-out.xml
@@ -20,7 +20,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1-3">5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-rng-random-in.xml b/tests/xmlparse-xml/change-rng-random-in.xml
index 446173e..22d3ed3 100644
--- a/tests/xmlparse-xml/change-rng-random-in.xml
+++ b/tests/xmlparse-xml/change-rng-random-in.xml
@@ -20,7 +20,7 @@
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset='1-3'>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-rng-random-out.xml b/tests/xmlparse-xml/change-rng-random-out.xml
index b98d4a2..018b517 100644
--- a/tests/xmlparse-xml/change-rng-random-out.xml
+++ b/tests/xmlparse-xml/change-rng-random-out.xml
@@ -20,7 +20,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1-3">5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/xmlparse-xml/change-smartcard-in.xml
index 26804fc..ddb9571 100644
--- a/tests/xmlparse-xml/change-smartcard-in.xml
+++ b/tests/xmlparse-xml/change-smartcard-in.xml
@@ -20,7 +20,7 @@
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset='1-3'>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/xmlparse-xml/change-smartcard-out.xml
index 57ff4b2..eac391b 100644
--- a/tests/xmlparse-xml/change-smartcard-out.xml
+++ b/tests/xmlparse-xml/change-smartcard-out.xml
@@ -20,7 +20,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1-3">5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-sounds-in.xml b/tests/xmlparse-xml/change-sounds-in.xml
index dc5365d..88c77d4 100644
--- a/tests/xmlparse-xml/change-sounds-in.xml
+++ b/tests/xmlparse-xml/change-sounds-in.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-sounds-out.xml b/tests/xmlparse-xml/change-sounds-out.xml
index dfd9ddd..abc1ea9 100644
--- a/tests/xmlparse-xml/change-sounds-out.xml
+++ b/tests/xmlparse-xml/change-sounds-out.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-tpm-in.xml b/tests/xmlparse-xml/change-tpm-in.xml
index 05a1154..82246ed 100644
--- a/tests/xmlparse-xml/change-tpm-in.xml
+++ b/tests/xmlparse-xml/change-tpm-in.xml
@@ -20,7 +20,7 @@
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset='1-3'>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-tpm-out.xml b/tests/xmlparse-xml/change-tpm-out.xml
index 599f88e..47d0dfd 100644
--- a/tests/xmlparse-xml/change-tpm-out.xml
+++ b/tests/xmlparse-xml/change-tpm-out.xml
@@ -20,7 +20,7 @@
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu cpuset="1-3">5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-videos-in.xml b/tests/xmlparse-xml/change-videos-in.xml
index 7dde768..f1f5bff 100644
--- a/tests/xmlparse-xml/change-videos-in.xml
+++ b/tests/xmlparse-xml/change-videos-in.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-videos-out.xml b/tests/xmlparse-xml/change-videos-out.xml
index 36780ad..ab8c026 100644
--- a/tests/xmlparse-xml/change-videos-out.xml
+++ b/tests/xmlparse-xml/change-videos-out.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-watchdogs-in.xml b/tests/xmlparse-xml/change-watchdogs-in.xml
index fb9bcd1..7bd6738 100644
--- a/tests/xmlparse-xml/change-watchdogs-in.xml
+++ b/tests/xmlparse-xml/change-watchdogs-in.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse-xml/change-watchdogs-out.xml b/tests/xmlparse-xml/change-watchdogs-out.xml
index 2b9622d..8e8021e 100644
--- a/tests/xmlparse-xml/change-watchdogs-out.xml
+++ b/tests/xmlparse-xml/change-watchdogs-out.xml
@@ -15,7 +15,7 @@
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <vcpu>5</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index 9697fbf..6ac3d15 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -115,7 +115,7 @@ class XMLParseTest(unittest.TestCase):
         check("bootloader", None, "pygrub")
         check("on_poweroff", "destroy", "restart")
         check("on_reboot", "restart", "destroy")
-        check("on_crash", "restart", "destroy")
+        check("on_crash", "destroy", "restart")
         check("on_lockfailure", "poweroff", "restart")
 
         check = self._make_checker(guest.clock)
-- 
2.9.3




More information about the virt-tools-list mailing list