Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes: fix qubes.QubesVMMConnection

Browse Source 
fix logical error in resetting offline_mode
and drop redundant _common_getter()
This commit is contained in:
Wojtek Porczyk 2014-11-17 13:46:53 +01:00
parent cec3db993d
commit 57d35fbc4c
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qubes/__init__.py
View File

@ -29,7 +29,7 @@ class QubesVMMConnection(object):
@offline_mode.setter @offline_mode.setter
def offline_mode(self, value): def offline_mode(self, value):
if not value and self._libvirt_conn is not None: if value and self._libvirt_conn is not None:
raise QubesException("Cannot change offline mode while already connected") raise QubesException("Cannot change offline mode while already connected")
self._offline_mode = value self._offline_mode = value
@ -46,7 +46,7 @@ class QubesVMMConnection(object):
return return
if self._offline_mode: if self._offline_mode:
# Do not initialize in offline mode # Do not initialize in offline mode
return raise QubesException("VMM operations disabled in offline mode")
if 'xen.lowlevel.xs' in sys.modules: if 'xen.lowlevel.xs' in sys.modules:
self._xs = xen.lowlevel.xs.xs() self._xs = xen.lowlevel.xs.xs()
@ -56,19 +56,11 @@ class QubesVMMConnection(object):
libvirt.registerErrorHandler(self._libvirt_error_handler, None) libvirt.registerErrorHandler(self._libvirt_error_handler, None)
atexit.register(self._libvirt_conn.close) atexit.register(self._libvirt_conn.close)
def _common_getter(self, name):
if self._offline_mode:
# Do not initialize in offline mode
raise QubesException("VMM operations disabled in offline mode")
if self._libvirt_conn is None:
self.init_vmm_connection()
return getattr(self, name)
@property @property
def libvirt_conn(self): def libvirt_conn(self):
'''Connection to libvirt''' '''Connection to libvirt'''
return self._common_getter('_libvirt_conn') self.init_vmm_connection()
return self._libvirt_conn
@property @property
def xs(self): def xs(self):
@ -76,11 +68,12 @@ class QubesVMMConnection(object):
This property in available only when running on Xen.''' This property in available only when running on Xen.'''
if 'xen.lowlevel.xs' in sys.modules: if 'xen.lowlevel.xs' not in sys.modules:
return self._common_getter('_xs')
else:
return None return None
self.init_vmm_connection()
return self._xs
if not dry_run: if not dry_run:
vmm = QubesVMMConnection() vmm = QubesVMMConnection()