Change in vdsm[master]: vm: make the 'destroyed' field private
fromani at redhat.com
fromani at redhat.com
Mon Aug 11 15:48:36 UTC 2014
Francesco Romani has uploaded a new change for review.
Change subject: vm: make the 'destroyed' field private
......................................................................
vm: make the 'destroyed' field private
it is used only internally, so no reason to expose it.
Change-Id: I62d1296bf9f2e393b345d7b6efcc60d094144c8c
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/31355/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 564dfa4..6f05e27 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1474,7 +1474,7 @@
self._initLegacyConf() # restore placeholders for BC sake
self.cif = cif
self.log = SimpleLogAdapter(self.log, {"vmId": self.conf['vmId']})
- self.destroyed = False
+ self._destroyed = False
self._recoveryFile = constants.P_VDSM_RUN + \
str(self.conf['vmId']) + '.recovery'
self._monitorResponse = 0
@@ -1931,7 +1931,7 @@
domains = []
for drive in drives:
with self._volPrepareLock:
- if self.destroyed:
+ if self._destroyed:
# A destroy request has been issued, exit early
break
drive['path'] = self.cif.prepareVolumePath(drive, self.id)
@@ -1981,7 +1981,7 @@
pass
def _saveStateInternal(self):
- if self.destroyed:
+ if self._destroyed:
return
with self._confLock:
toSave = deepcopy(self.status())
@@ -2800,7 +2800,7 @@
uuidPath, name)
def _domDependentInit(self):
- if self.destroyed:
+ if self._destroyed:
# reaching here means that Vm.destroy() was called before we could
# handle it. We must handle it now
try:
@@ -4610,7 +4610,7 @@
hooks.before_vm_destroy(self._lastXMLDesc, self.conf)
self._shutdownReason = vmexitreason.ADMIN_SHUTDOWN
- self.destroyed = True
+ self._destroyed = True
return self.releaseVm()
--
To view, visit http://gerrit.ovirt.org/31355
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62d1296bf9f2e393b345d7b6efcc60d094144c8c
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