From 973d79e93248384d72338dd400c2dd39271d5584 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@mimuw.edu.pl>
Date: Sat, 9 Jul 2011 17:56:06 +0200
Subject: [PATCH] dom0: remove calls to not existing *_xen_storage methods in
 qvm-*

---
 dom0/qvm-tools/qvm-add-appvm      |  8 --------
 dom0/qvm-tools/qvm-backup-restore | 16 ----------------
 dom0/qvm-tools/qvm-remove         |  9 ---------
 3 files changed, 33 deletions(-)

diff --git a/dom0/qvm-tools/qvm-add-appvm b/dom0/qvm-tools/qvm-add-appvm
index b39632d0..c2a84e11 100755
--- a/dom0/qvm-tools/qvm-add-appvm
+++ b/dom0/qvm-tools/qvm-add-appvm
@@ -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()
     
diff --git a/dom0/qvm-tools/qvm-backup-restore b/dom0/qvm-tools/qvm-backup-restore
index 121956a8..8e3e2123 100755
--- a/dom0/qvm-tools/qvm-backup-restore
+++ b/dom0/qvm-tools/qvm-backup-restore
@@ -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()
diff --git a/dom0/qvm-tools/qvm-remove b/dom0/qvm-tools/qvm-remove
index 5f1b1aa2..f826cdbc 100755
--- a/dom0/qvm-tools/qvm-remove
+++ b/dom0/qvm-tools/qvm-remove
@@ -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: