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

[Kevin Zhao]

Besides,
     When I don't specify direct kernel boot , virt-manager will restart 
the guest again and again ,then become no response. I have reported a 
bug here : https://bugzilla.redhat.com/show_bug.cgi?id=1279320
     Feel free to ask me  if you have any question.
     Thanks ~
Best Regards ,
Kevin


On 2015年11月09日 10:58, Kevin Zhao wrote:
> Hi Cole,
> Thanks for your comment.
> I have modified the patch and add the change in clitest.py.
>
> On 2015年11月09日 08:00, Cole Robinson wrote:
>> On 11/06/2015 01:25 AM, Kevin Zhao wrote:
>>> 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 +
>>> virtinst/devicewatchdog.py | 3 ++-
>>>   2 files changed, 3 insertions(+), 1 deletion(-)
>>>
>>> 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>
>> You've added this XML, but no corresponding change in clitest.py, so 
>> this
>> breaks the test suite.
>>
>> - Cole
>>
>>> 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"
>>>
>
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list