mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 17:57:34 +03:00
details: Don't silently drop managed save when renaming VM
Instead just error about it. Until there's an actual libvirt 'rename' API we can't do much better than that.
This commit is contained in:
parent
5f34e7d885
commit
844a567e7b
@ -734,7 +734,7 @@ class vmmConnection(vmmGObject):
|
||||
|
||||
def _rename_helper(self, objtype, define_cb, obj, origxml, newxml):
|
||||
# Undefine the original object
|
||||
obj.delete()
|
||||
obj.delete(force=False)
|
||||
|
||||
newobj = None
|
||||
try:
|
||||
|
@ -157,7 +157,8 @@ class vmmDomainSnapshot(vmmLibvirtObject):
|
||||
|
||||
def is_current(self):
|
||||
return self._backend.isCurrent()
|
||||
def delete(self):
|
||||
def delete(self, force=True):
|
||||
ignore = force
|
||||
self._backend.delete()
|
||||
|
||||
|
||||
@ -1211,11 +1212,12 @@ class vmmDomain(vmmLibvirtObject):
|
||||
self._backend.suspend()
|
||||
self.idle_add(self.force_update_status)
|
||||
|
||||
def delete(self):
|
||||
try:
|
||||
self.removeSavedImage()
|
||||
except:
|
||||
logging.exception("Failed to remove managed save state")
|
||||
def delete(self, force=True):
|
||||
if force:
|
||||
try:
|
||||
self.removeSavedImage()
|
||||
except:
|
||||
logging.exception("Failed to remove managed save state")
|
||||
self._backend.undefine()
|
||||
|
||||
def resume(self):
|
||||
|
@ -88,7 +88,8 @@ class vmmInterface(vmmLibvirtObject):
|
||||
self.idle_add(self.refresh_xml)
|
||||
self._kick_conn()
|
||||
|
||||
def delete(self):
|
||||
def delete(self, force=True):
|
||||
ignore = force
|
||||
self._backend.undefine()
|
||||
self._kick_conn()
|
||||
|
||||
|
@ -104,6 +104,9 @@ class vmmLibvirtObject(vmmGObject):
|
||||
ignore = xml
|
||||
return
|
||||
|
||||
def delete(self, force=True):
|
||||
ignore = force
|
||||
|
||||
|
||||
##################
|
||||
# Public XML API #
|
||||
|
@ -94,7 +94,8 @@ class vmmNetwork(vmmLibvirtObject):
|
||||
self._backend.destroy()
|
||||
self._kick_conn()
|
||||
|
||||
def delete(self):
|
||||
def delete(self, force=True):
|
||||
ignore = force
|
||||
self._backend.undefine()
|
||||
self._backend = None
|
||||
self._kick_conn()
|
||||
|
@ -52,7 +52,8 @@ class vmmStorageVolume(vmmLibvirtObject):
|
||||
pobj = self._backend.storagePoolLookupByVolume()
|
||||
return self.conn.get_pool_by_name(pobj.name())
|
||||
|
||||
def delete(self):
|
||||
def delete(self, force=True):
|
||||
ignore = force
|
||||
self._backend.delete(0)
|
||||
self._backend = None
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user