Change in vdsm[master]: Live Merge: Fix backing chain xml parsing

alitke at redhat.com alitke at redhat.com
Fri Jun 20 18:52:43 UTC 2014


Adam Litke has uploaded a new change for review.

Change subject: Live Merge: Fix backing chain xml parsing
......................................................................

Live Merge: Fix backing chain xml parsing

The backingStore element is optional inside of a disk XML block.  It
will be missing for disks with no backing files (ie. new VM based on
the blank template).  Handle this case by breaking out of the loop
rather than returning an error.

Change-Id: I6128d1eb1265f7ede1ab420ac7b5342bc7f2db9e
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/29006/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index cb05ad6..1dd849a 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -5600,7 +5600,7 @@
             volChain.insert(0, pathToVolID(drive, path))
             bsXML = findElement(diskXML, 'backingStore')
             if not bsXML:
-                return None
+                break
             diskXML = bsXML
         return volChain
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6128d1eb1265f7ede1ab420ac7b5342bc7f2db9e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke at redhat.com>


More information about the vdsm-patches mailing list