From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 14E6D72AEC for ; Tue, 13 Apr 2021 14:17:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C13C92A966 for ; Tue, 13 Apr 2021 14:16:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9B28B2A923 for ; Tue, 13 Apr 2021 14:16:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 67EE845A72 for ; Tue, 13 Apr 2021 14:16:56 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 13 Apr 2021 14:16:34 +0200 Message-Id: <20210413121640.3602975-17-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> References: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemu.pm] Subject: [pve-devel] [PATCH qemu-server 1/7] migrate: factor out storage checks X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 12:17:28 -0000 to re-use them for incoming remote migrations. Signed-off-by: Fabian Grünbichler --- 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