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

core: do not undefine libvirt domain when not necessary

Browse Source 
Libvirt will replace domain XML when trying to define the new one with
the same name and UUID - this is exactly what we need. This fixes race
condition with other processes (especially Qubes Manager), which can try
to access that libvirt domain object at the same time.
This commit is contained in:
Marek Marczykowski-Górecki 2015-03-29 16:21:33 +02:00
parent 1b428f6865
commit 124a26ec97
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core-modules/000QubesVm.py
View File

@ -562,7 +562,6 @@ class QubesVm(object):
self.pre_rename(name) self.pre_rename(name)
if self.libvirt_domain: if self.libvirt_domain:
self.libvirt_domain.undefine() self.libvirt_domain.undefine()
self._libvirt_domain = None
if self._qdb_connection: if self._qdb_connection:
self._qdb_connection.close() self._qdb_connection.close()
self._qdb_connection = None self._qdb_connection = None
@ -672,8 +671,6 @@ class QubesVm(object):
def _update_libvirt_domain(self): def _update_libvirt_domain(self):
domain_config = self.create_config_file() domain_config = self.create_config_file()
if self._libvirt_domain:
self._libvirt_domain.undefine()
try: try:
self._libvirt_domain = vmm.libvirt_conn.defineXML(domain_config) self._libvirt_domain = vmm.libvirt_conn.defineXML(domain_config)
self.uuid = uuid.UUID(bytes=self._libvirt_domain.UUID()) self.uuid = uuid.UUID(bytes=self._libvirt_domain.UUID())