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

dom0: remove calls to not existing *_xen_storage methods in qvm-*

Browse Source
This commit is contained in:
Marek Marczykowski 2011-07-09 17:56:06 +02:00
parent d11271df97
commit 973d79e932
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom0/qvm-tools/qvm-add-appvm
View File

@ -68,14 +68,6 @@ def main():
qvm_collection.pop(vm.qid)
exit (1)
try:
vm.add_to_xen_storage()
except (IOError, OSError) as err:
print "ERROR: {0}".format(err)
qvm_collection.pop(vm.qid)
exit (1)
qvm_collection.save()
qvm_collection.unlock_db()

16
dom0/qvm-tools/qvm-backup-restore
View File

@ -333,15 +333,6 @@ def main():
host_collection.pop(vm.qid)
continue
try:
vm.add_to_xen_storage()
except (IOError, OSError) as err:
print "ERROR: {0}".format(err)
print "*** Skiping VM: {0}".vm.name
host_collection.pop(vm.qid)
continue
# ... then appvms...
for vm in [ vm for vm in vms_to_restore if vm.is_appvm()]:
@ -401,13 +392,6 @@ def main():
host_collection.pop(vm.qid)
continue
try:
vm.add_to_xen_storage()
except (IOError, OSError) as err:
print "ERROR: {0}".format(err)
print "*** VM '{0}' will not boot until you manually fix it (or correctly restore this VM)!".format(vm.name)
backup_collection.unlock_db()
host_collection.save()
host_collection.unlock_db()

9
dom0/qvm-tools/qvm-remove
View File

@ -79,15 +79,6 @@ def main():
print "This VM has been installed by RPM, use rpm -e <pkg name> to remove it!"
exit (1)
try:
if options.verbose:
print "--> Removing from Xen Storage..."
vm.remove_from_xen_storage()
except (IOError, OSError) as err:
print "Warning: {0}".format(err)
# Do not exit, perhaps the VM was not in the Xen store
# so just remove it from Qubes DB
try:
if vm.installed_by_rpm:
if options.verbose: