Fix overwriting VNC password when updating VM xml.

This commit is contained in:
Cole Robinson 2009-02-28 17:21:41 -05:00
parent caa149823f
commit dbf5a43902

View File

@ -70,9 +70,12 @@ class vmmDomain(gobject.GObject):
def get_xml(self): def get_xml(self):
if self.xml is None: if self.xml is None:
self.xml = self.vm.XMLDesc(0) self.update_xml()
return self.xml return self.xml
def update_xml(self):
self.xml = self.vm.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE)
def release_handle(self): def release_handle(self):
del(self.vm) del(self.vm)
self.vm = None self.vm = None
@ -924,7 +927,8 @@ class vmmDomain(gobject.GObject):
return xml[0:index] + devxml + xml[index:] return xml[0:index] + devxml + xml[index:]
def get_device_xml(self, dev_type, dev_id_info): def get_device_xml(self, dev_type, dev_id_info):
vmxml = self.vm.XMLDesc(0) self.update_xml()
vmxml = self.get_xml()
doc = None doc = None
ctx = None ctx = None
@ -1031,7 +1035,8 @@ class vmmDomain(gobject.GObject):
def _remove_xml_device(self, dev_type, dev_id_info): def _remove_xml_device(self, dev_type, dev_id_info):
"""Remove device 'devxml' from devices section of 'xml, return """Remove device 'devxml' from devices section of 'xml, return
result""" result"""
vmxml = self.vm.XMLDesc(0) self.update_xml()
vmxml = self.get_xml()
doc = libxml2.parseDoc(vmxml) doc = libxml2.parseDoc(vmxml)
ctx = None ctx = None
@ -1071,7 +1076,8 @@ class vmmDomain(gobject.GObject):
def add_device(self, xml): def add_device(self, xml):
"""Redefine guest with appended device""" """Redefine guest with appended device"""
vmxml = self.vm.XMLDesc(0) self.update_xml()
vmxml = self.get_xml()
newxml = self._add_xml_device(vmxml, xml) newxml = self._add_xml_device(vmxml, xml)