[PATCH v2] virtinst: set preserve when on_crash in s390x

[Leno Hou <lenohou@xxxxxxxxx>]

When booting from empty disk image or none bootdev, its leads
system IPL enter into infinite loop with message on s390x.
This patch sets preserve when on_crash to avoid the loop

Signed-off-by: Leno Hou <lenohou@xxxxxxxxx>
---
 tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml | 2 +-
 tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml        | 2 +-
 virtinst/guest.py                                              | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
index a6f25c0..63e37eb 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.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>preserve</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="disk">
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
index 0083dc0..235c99d 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.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>preserve</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type="file" device="disk">
diff --git a/virtinst/guest.py b/virtinst/guest.py
index ab6dcba..75e2ea2 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -358,6 +358,9 @@ class Guest(XMLBuilder):
         if install:
             self.on_reboot = "destroy"
             self.on_crash = "destroy"
+	# on_crash=restart can cause reboot loops on s390x, so use preserve
+	elif self.os.is_s390x():
+            self.on_crash = "preserve"
 
         self._set_osxml_defaults()
 
-- 
1.9.1

_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list