[pve-devel] [PATCH qemu-server 2/3] migrate: always check if content type images is available for target storage

Fabian Ebner f.ebner at proxmox.com
Fri Mar 19 14:49:07 CET 2021


it's cheap and saves code.

Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
 PVE/QemuMigrate.pm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 3597cc9..44cecce 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -410,11 +410,8 @@ sub sync_disks {
 	    $log_error->("storage '$targetsid' is not available on node '$self->{node}'")
 		if !$target_scfg;
 
-	    # grandfather in existing mismatches
-	    if ($targetsid ne $storeid && $target_scfg) {
-		$log_error->("content type 'images' is not available on storage '$targetsid'")
-		    if !$target_scfg->{content}->{images};
-	    }
+	    $log_error->("content type 'images' is not available on storage '$targetsid'")
+		if $target_scfg && !$target_scfg->{content}->{images};
 
 	    PVE::Storage::foreach_volid($dl, sub {
 		my ($volid, $sid, $volinfo) = @_;
-- 
2.20.1






More information about the pve-devel mailing list