Change in vdsm[master]: BZ#855924 -- fix 3.1 -> 3.0 migration again - vdsm-patches - Fedora mailing-lists

5 Nov 2012

Peter V. Saveliev has uploaded a new change for review.
Change subject: BZ#855924 -- fix 3.1 -> 3.0 migration again
......................................................................
BZ#855924 -- fix 3.1 -> 3.0 migration again
The issue was that fixing self._vm.conf is not enough -- we should
fix self._machineParams, that will work in all the cases.
Signed-off-by: Peter V. Saveliev peet@redhat.com
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=855924
Change-Id: I334cd39cad3eed30c2c3f1efa7085526454a44fb
---
M vdsm/vm.py
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/9036/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index 2229882..591ac1a 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -236,15 +236,15 @@
         """
         # care only about "drives" list, since
         # "devices" doesn't cause errors
-        if 'drives' in self._vm.conf:
+        if 'drives' in self._machineParams:
             for item in ("cdrom", "floppy"):
                 new_drives = []
-                for drive in self._vm.conf['drives']:
+                for drive in self._machineParams['drives']:
                     if drive['device'] == item:
-                        self._vm.conf[item] = drive['path']
+                        self._machineParams[item] = drive['path']
                     else:
                         new_drives.append(drive)
-                self._vm.conf['drives'] = new_drives
+                self._machineParams['drives'] = new_drives
def run(self):
         try:
--
To view, visit http://gerrit.ovirt.org/9036
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I334cd39cad3eed30c2c3f1efa7085526454a44fb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Peter V. Saveliev peet@redhat.com

    