Change in vdsm[master]: Delete useless withRelaunch argument of onReboot in vm.py

Jarod.w work.iec23801 at gmail.com
Wed Nov 7 07:03:21 UTC 2012


Jarod.w has uploaded a new change for review.

Change subject: Delete useless withRelaunch argument of onReboot in vm.py
......................................................................

Delete useless withRelaunch argument of onReboot in vm.py

If we set the withRelaunch argument to True, it can't work normally
because function relaunch() on clientIF class isn't defined.Here, we
delete the useless argument directly to avoid potential error.

Change-Id: I53b372feca865327e9e81f1b89e6d7566038c031
Signed-off-by: jarod.w <work.iec23801 at gmail.com>
---
M vdsm/libvirtconnection.py
M vdsm/vm.py
2 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/9096/1

diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py
index 824923d..d0f9452 100644
--- a/vdsm/libvirtconnection.py
+++ b/vdsm/libvirtconnection.py
@@ -45,7 +45,7 @@
             event, detail = args[:-1]
             v._onLibvirtLifecycleEvent(event, detail, None)
         elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_REBOOT:
-            v.onReboot(False)
+            v.onReboot()
         elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE:
             utcoffset, = args[:-1]
             v._rtcUpdate(utcoffset)
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 2229882..48b1164 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -762,7 +762,7 @@
 
         os.rename(f.name, self._recoveryFile)
 
-    def onReboot(self, withRelaunch):
+    def onReboot(self):
         try:
             self.log.debug('reboot event')
             self._startTime = time.time()
@@ -773,8 +773,6 @@
             if self.conf.get('volatileFloppy'):
                 self._ejectFloppy()
                 self.log.debug('ejected volatileFloppy')
-            if withRelaunch:
-                self.cif.relaunch(self.status())
         except:
             self.log.error("Reboot event failed", exc_info=True)
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53b372feca865327e9e81f1b89e6d7566038c031
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Jarod.w <work.iec23801 at gmail.com>


More information about the vdsm-patches mailing list