guest: Don't set any defaults for on_*

Currently we hardcode these defaults for installing VMs:

  <on_poweroff>destroy</on_poweroff>
  <on_reboot>destroy</on_reboot>
  <on_crash>destroy</on_crash>

And these for post-install config:

  <on_poweroff>destroy</on_poweroff>
  <on_reboot>restart</on_reboot>
  <on_crash>restart</on_crash>

But this has some issues. on_crash=restart is problematic in that most
configs don't support it, and some like virtuozzo actively reject it.
Additionally this we should leave as much to libvirt defaults as we
can, which are more sensible in this case.

Drop everything except setting on_reboot=destroy for the install time
case (which is required for our config changes). Since on_poweroff
and on_crash already default to 'destroy', the install time config
is unchanged, and the post-install config now on_crash=destroy instead
of 'restart'.

The s390 on_crash=preserve workaround is dropped, which was intended
to avoid a reboot loop caused by on_crash=reboot

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>

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">

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">

tests/cli-test-xml/compare/virt-convert-ovf-compare.xml

@@ -22,9 +22,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-convert-vmx-compare.xml

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

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">

tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml

@@ -14,9 +14,6 @@
   </features>
   <cpu mode="host-passthrough"/>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml

@@ -11,9 +11,6 @@
   </os>
   <cpu mode="host-passthrough"/>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml

@@ -14,9 +14,6 @@
     <model>cortex-a57</model>
   </cpu>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml

@@ -14,9 +14,6 @@
     <model>cortex-a57</model>
   </cpu>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml

@@ -11,9 +11,6 @@
     <cmdline>foo</cmdline>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml

@@ -10,9 +10,6 @@
   </os>
   <cpu mode="host-passthrough"/>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-arm-vexpress-f19.xml

@@ -12,9 +12,6 @@
     <dtb>/f19-arm.dtb</dtb>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml

@@ -12,9 +12,6 @@
     <dtb>/f19-arm.dtb</dtb>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml

@@ -11,9 +11,6 @@
     <cmdline>console=ttyAMA0,1234 rw root=/dev/vda3</cmdline>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-arm</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-cpuset-auto.xml

@@ -12,9 +12,7 @@
     <pae/>
   </features>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -52,9 +50,6 @@
     <pae/>
   </features>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-default.xml

@@ -8,9 +8,6 @@
     <type arch="x86_64">exe</type>
     <init>/bin/sh</init>
   </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/libexec/libvirt_lxc</emulator>
     <interface type="bridge">

tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-disk enabled="yes"/>
     <suspend-to-mem enabled="no"/>

tests/cli-test-xml/compare/virt-install-fs-default.xml

@@ -11,9 +11,6 @@
   <features>
     <privnet/>
   </features>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/libexec/libvirt_lxc</emulator>
     <filesystem>

tests/cli-test-xml/compare/virt-install-kvm-centos7.xml

@@ -22,9 +22,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -94,9 +92,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml

@@ -21,9 +21,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -80,9 +78,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml

@@ -22,9 +22,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -94,9 +92,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml

@@ -22,9 +22,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -94,9 +92,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml

@@ -22,9 +22,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -99,9 +97,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml

@@ -28,9 +28,7 @@
     <timer name="hpet" present="no"/>
     <timer name="hypervclock" present="yes"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -98,9 +96,6 @@
     <timer name="hpet" present="no"/>
     <timer name="hypervclock" present="yes"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-location-iso.xml

@@ -22,9 +22,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -86,9 +84,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-manual-init.xml

@@ -8,9 +8,6 @@
     <type arch="x86_64">exe</type>
     <init>/usr/bin/httpd</init>
   </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/libexec/libvirt_lxc</emulator>
     <interface type="bridge">

tests/cli-test-xml/compare/virt-install-many-devices.xml

@@ -20,9 +20,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml

@@ -9,9 +9,6 @@
     <boot dev="network"/>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml

@@ -9,9 +9,6 @@
     <boot dev="network"/>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml

@@ -9,9 +9,6 @@
     <boot dev="hd"/>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-q35-defaults.xml

@@ -22,9 +22,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -95,9 +93,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml

@@ -18,9 +18,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-qemu-plain.xml

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml

@@ -10,9 +10,6 @@
     <initrd>/initrd.img</initrd>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>preserve</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml

@@ -10,9 +10,6 @@
     <initrd>/initrd.img</initrd>
   </os>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>preserve</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type="file" device="disk">

tests/cli-test-xml/compare/virt-install-simple-pxe.xml

@@ -12,9 +12,7 @@
     <pae/>
   </features>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -52,9 +50,6 @@
     <pae/>
   </features>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-singleton-config-1.xml

@@ -26,8 +26,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <resource>
     <partition>/virtualmachines/production</partition>

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>

tests/cli-test-xml/compare/virt-install-solaris10-defaults.xml

@@ -22,9 +22,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-spice-gl.xml

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml

@@ -21,9 +21,7 @@
     <topology sockets="1" cores="4" threads="1"/>
   </cpu>
   <clock offset="localtime"/>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -69,9 +67,6 @@
     <topology sockets="1" cores="4" threads="1"/>
   </cpu>
   <clock offset="localtime"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-win7-uefi.xml

@@ -24,9 +24,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>
@@ -99,9 +97,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/cli-test-xml/compare/virt-install-xen-default.xml

@@ -5,9 +5,6 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>

tests/cli-test-xml/compare/virt-install-xen-hvm.xml

@@ -16,9 +16,6 @@
     <pae/>
   </features>
   <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type="block" device="disk">

tests/cli-test-xml/compare/virt-install-xen-pv.xml

@@ -10,9 +10,7 @@
     <initrd>/tmp/virtinst-initrd.img.</initrd>
     <cmdline>method=tests/cli-test-xml/faketree</cmdline>
   </os>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <devices>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
@@ -35,9 +33,6 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <bootloader>/usr/bin/pygrub</bootloader>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>

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"/>

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"/>

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>

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 &amp; yeah boii &lt; &gt; 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>

tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt

@@ -22,9 +22,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2

@@ -22,9 +22,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt

@@ -22,9 +22,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt

@@ -22,9 +22,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw

@@ -21,9 +21,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt

@@ -22,9 +22,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/xmlconfig-xml/install-f11-norheldefaults.xml

@@ -17,9 +17,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type="file" device="floppy">

tests/xmlconfig-xml/install-f11-rheldefaults.xml

@@ -17,9 +17,6 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <disk type="file" device="floppy">

tests/xmlconfig-xml/install-hyperv-clock.xml

@@ -24,9 +24,7 @@
     <timer name="hpet" present="no"/>
     <timer name="hypervclock" present="yes"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/xmlconfig-xml/install-hyperv-noclock.xml

@@ -23,9 +23,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

tests/xmlconfig-xml/install-novmvga-rhel.xml

@@ -18,9 +18,7 @@
     <timer name="pit" tickpolicy="delay"/>
     <timer name="hpet" present="no"/>
   </clock>
-  <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <pm>
     <suspend-to-mem enabled="no"/>
     <suspend-to-disk enabled="no"/>

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>

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>

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'>

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">

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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'/>

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"/>

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>

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>

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>

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>

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>

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>

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'>

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">

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">

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">

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>

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>

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>

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>

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>

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>