[pve-devel] [PATCH qemu-server 1/7] migrate: factor out storage checks

[Fabian Grünbichler]

to re-use them for incoming remote migrations.

Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com>
---
 PVE/API2/Qemu.pm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index c56b609..a789456 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -133,6 +133,18 @@ my $check_storage_access_clone = sub {
    return $sharedvm;
 };
 
+my $check_storage_access_migrate = sub {
+    my ($rpcenv, $authuser, $storecfg, $storage, $node) = @_;
+
+    PVE::Storage::storage_check_node($storecfg, $storage, $node);
+
+    $rpcenv->check($authuser, "/storage/$storage", 
['Datastore.AllocateSpace']);
+
+    my $scfg = PVE::Storage::storage_config($storecfg, $storage);
+    die "storage '$storage' does not support vm images\n"
+       if !$scfg->{content}->{images};
+};
+
 # Note: $pool is only needed when creating a VM, because pool permissions
 # are automatically inherited if VM already exists inside a pool.
 my $create_disks = sub {
@@ -3684,17 +3696,7 @@ __PACKAGE__->register_method({
        }
 
        my $storecfg = PVE::Storage::config();
-
        if (my $targetstorage = $param->{targetstorage}) {
-           my $check_storage = sub {
-               my ($target_sid) = @_;
-               PVE::Storage::storage_check_node($storecfg, $target_sid, 
$target);
-               $rpcenv->check($authuser, "/storage/$target_sid", 
['Datastore.AllocateSpace']);
-               my $scfg = PVE::Storage::storage_config($storecfg, $target_sid);
-               raise_param_exc({ targetstorage => "storage '$target_sid' does 
not support vm images"})
-                   if !$scfg->{content}->{images};
-           };
-
            my $storagemap = eval { 
PVE::JSONSchema::parse_idmap($targetstorage, 'pve-storage-id') };
            raise_param_exc({ targetstorage => "failed to parse storage map: 
$@" })
                if $@;
@@ -3703,10 +3705,10 @@ __PACKAGE__->register_method({
                if !defined($storagemap->{identity});
 
            foreach my $target_sid (values %{$storagemap->{entries}}) {
-               $check_storage->($target_sid);
+               $check_storage_access_migrate->($rpcenv, $authuser, $storecfg, 
$target_sid, $target);
            }
 
-           $check_storage->($storagemap->{default})
+           $check_storage_access_migrate->($rpcenv, $authuser, $storecfg, 
$storagemap->{default}, $target)
                if $storagemap->{default};
 
            PVE::QemuServer::check_storage_availability($storecfg, $conf, 
$target)
-- 
2.20.1



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel