Change in vdsm[master]: virt: dev: implement from_xml for WatchdogDevice

fromani at redhat.com fromani at redhat.com
Fri Oct 3 07:17:09 UTC 2014


Francesco Romani has uploaded a new change for review.

Change subject: virt: dev: implement from_xml for WatchdogDevice
......................................................................

virt: dev: implement from_xml for WatchdogDevice

Change-Id: I8ceb0f85908c99454f0c981fa4318cc1989f0f7c
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/33752/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index a63c932..e340ed0 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -4845,19 +4845,18 @@
 
             # PCI watchdog has "address" different from ISA watchdog
             if x.getElementsByTagName('address'):
-                address = vmxml.device_address(x)
-                alias = x.getElementsByTagName('alias')[0].getAttribute('name')
+                dev = WatchdogDevice.from_xml(x)
 
                 for wd in self._devices[WATCHDOG_DEVICES]:
                     if not hasattr(wd, 'address') or not hasattr(wd, 'alias'):
-                        wd.address = address
-                        wd.alias = alias
+                        wd.address = dev.address
+                        wd.alias = dev.alias
 
                 for dev in self.conf['devices']:
                     if ((dev['type'] == WATCHDOG_DEVICES) and
                             (not dev.get('address') or not dev.get('alias'))):
-                        dev['address'] = address
-                        dev['alias'] = alias
+                        dev['address'] = dev.address
+                        dev['alias'] = dev.alias
 
     def _getUnderlyingVideoDeviceInfo(self):
         """


-- 
To view, visit http://gerrit.ovirt.org/33752
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ceb0f85908c99454f0c981fa4318cc1989f0f7c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list