  
      def _cleanup_lvm(self, instance):
          """Delete all LVM disks for given instance object."""
-@@ -2618,13 +2619,15 @@ class LibvirtDriver(driver.ComputeDriver):
+@@ -2639,13 +2640,15 @@ class LibvirtDriver(driver.ComputeDriver):
              if size == 0 or suffix == '.rescue':
                  size = None
  

             console_file = self._get_console_log_path(instance)
             libvirt_utils.file_open(console_file, 'a').close()
diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
index 6511496..016c98c 100644
--- a/nova/virt/libvirt/imagebackend.py
+++ b/nova/virt/libvirt/imagebackend.py
@@ -32,17 +32,9 @@ from nova import utils

+        :param block_migration: if true, it was a block migration
+        :param migrate_data: implementation specific data
+        :returns: (bool, bool) -- do_cleanup, destroy_disks
+        """
+        # NOTE(angdraug): block migration wouldn't have been allowed if either
+        #                 block storage or instance path were shared
+        is_shared_block_storage = not block_migration
