[PATCH] Add a watchdog model diag288, listed in the watchdog model list.

[Kevin Zhao <kevinzs@xxxxxxxxxxxxxxxxxx>]

Since the qemu 2.4 has supported the watchdog device diag288
for s390x,so add it in the optional model list. Also modefied
the clitest xml to cover this change.
---
 tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml | 1 +
 tests/clitest.py                                               | 2 +-
 virtinst/devicewatchdog.py                                     | 3 ++-
 3 files changed, 4 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 b9f057c..3cccaca 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
@@ -31,5 +31,6 @@
       <mac address="00:11:22:33:44:55"/>
     </interface>
     <console type="pty"/>
+    <watchdog model="diag288" action="reset"/>
   </devices>
 </domain>
diff --git a/tests/clitest.py b/tests/clitest.py
index f4ce381..c3180f6 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -705,7 +705,7 @@ c.add_compare("--connect %(URI-KVM-PPC64LE)s --import --disk %(EXISTIMG1)s --os-
 
 # s390x tests
 c.add_compare("--arch s390x --machine s390-ccw-virtio --connect %(URI-KVM-S390X)s --boot kernel=/kernel.img,initrd=/initrd.img --disk %(EXISTIMG1)s --disk %(EXISTIMG3)s,device=cdrom --os-variant fedora21", "s390x-cdrom")
-c.add_compare("--arch s390x --machine s390-ccw-virtio --connect %(URI-KVM-S390X-KVMIBM)s --boot kernel=/kernel.img,initrd=/initrd.img --disk %(EXISTIMG1)s --disk %(EXISTIMG3)s,device=cdrom --os-variant fedora21", "s390x-cdrom-KVMIBM")
+c.add_compare("--arch s390x --machine s390-ccw-virtio --connect %(URI-KVM-S390X-KVMIBM)s --boot kernel=/kernel.img,initrd=/initrd.img --disk %(EXISTIMG1)s --disk %(EXISTIMG3)s,device=cdrom --os-variant fedora21 --watchdog diag288,action=reset", "s390x-cdrom-KVMIBM")
 
 # qemu:///session tests
 c.add_compare("--connect %(URI-KVM-SESSION)s --disk size=8 --os-variant fedora21 --cdrom %(EXISTIMG1)s", "kvm-session-defaults")
diff --git a/virtinst/devicewatchdog.py b/virtinst/devicewatchdog.py
index 17c3e57..7bb9002 100644
--- a/virtinst/devicewatchdog.py
+++ b/virtinst/devicewatchdog.py
@@ -27,8 +27,9 @@ class VirtualWatchdog(VirtualDevice):
 
     MODEL_I6300 = "i6300esb"
     MODEL_IB700 = "ib700"
+    MODEL_DIAG288 = "diag288"
     MODEL_DEFAULT = "default"
-    MODELS = [MODEL_I6300, MODEL_IB700]
+    MODELS = [MODEL_I6300, MODEL_IB700, MODEL_DIAG288]
 
     ACTION_SHUTDOWN = "shutdown"
     ACTION_RESET    = "reset"
-- 
1.9.1

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