Vinzenz Feenstra has uploaded a new change for review.
Change subject: Moving conf init things together ......................................................................
Moving conf init things together
Change-Id: I41ac420cd0da5a3118ce5b3c4c3643b292ec2e86 Signed-off-by: Vinzenz Feenstra vfeenstr@redhat.com --- M vdsm/rpc/Bridge.py M vdsm/virt/vm.py 2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/29320/1
diff --git a/vdsm/rpc/Bridge.py b/vdsm/rpc/Bridge.py index 539c70c..12ed98e 100644 --- a/vdsm/rpc/Bridge.py +++ b/vdsm/rpc/Bridge.py @@ -286,6 +286,7 @@ """ return [v['vmId'] for v in ret['vmList']]
+ def Host_queryVms_Ret(ret): """ The result contains two data structures which must be merged diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 2c5c910..098a3d5 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1814,8 +1814,7 @@ """ self._dom = None self.recovering = recover - self.conf = {'pid': '0'} - self.conf['_blockJobs'] = {} + self.conf = {'pid': '0', '_blockJobs': {}, 'clientIp': ''} self.conf.update(params) self._initLegacyConf() # restore placeholders for BC sake self.cif = cif @@ -1825,7 +1824,6 @@ str(self.conf['vmId']) + '.recovery' self.user_destroy = False self._monitorResponse = 0 - self.conf['clientIp'] = '' self.memCommitted = 0 self._confLock = threading.Lock() self._jobsLock = threading.Lock()