shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-02 09:47:16 +03:00
Code Issues Projects Releases Wiki Activity

Add a watchdog model diag288, listed in the watchdog model list.

Browse Source 
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.
This commit is contained in:
Kevin Zhao 2015-11-09 10:57:29 +08:00 committed by Cole Robinson
parent 0e26031096
commit 07e22c926a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,5 +31,6 @@
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>
<watchdog model="diag288" action="reset"/>
</devices>
</domain>

2
tests/clitest.py
View File

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

3
virtinst/devicewatchdog.py
View File

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