From 373ea5798ada2359c8499f34f58c370b19fc41ee Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 16 Jul 2012 10:19:11 +0200
Subject: [PATCH] migrate: only scan available storages

---
 Makefile           | 2 +-
 PVE/QemuMigrate.pm | 5 +++--
 changelog.Debian   | 6 ++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 91b8d8ed..c1f52cf7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.1
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=44
+PKGREL=45
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 1b1e1f2b..1a35004a 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -181,13 +181,14 @@ sub sync_disks {
         foreach my $storeid (@sids) {
 	    my $scfg = PVE::Storage::storage_config($self->{storecfg}, $storeid);
             next if $scfg->{shared};
+	    next if !PVE::Storage::storage_check_enabled($self->{storecfg}, $storeid, undef, 1);
+
             # get list from PVE::Storage (for unused volumes)
             my $dl = PVE::Storage::vdisk_list($self->{storecfg}, $storeid, $vmid);
             PVE::Storage::foreach_volid($dl, sub {
                 my ($volid, $sid, $volname) = @_;
 
-                # check if storage is available on both nodes
-                my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid);
+                # check if storage is available on target node
                 PVE::Storage::storage_check_node($self->{storecfg}, $sid, $self->{node});
 
                 $volhash->{$volid} = 1;
diff --git a/changelog.Debian b/changelog.Debian
index a4408120..1e9895a7 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-45) unstable; urgency=low
+
+  * migrate: only scan available storages
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 16 Jul 2012 10:18:22 +0200
+
 qemu-server (2.0-44) unstable; urgency=low
 
   * migrate: only scan necessary storage for unused volumes