From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 085E11FF16F for <inbox@lore.proxmox.com>; Tue, 15 Apr 2025 15:51:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24CE09769; Tue, 15 Apr 2025 15:51:30 +0200 (CEST) From: Daniel Kral <d.kral@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 15 Apr 2025 15:50:29 +0200 Message-Id: <20250415135045.255272-12-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250415135045.255272-1-d.kral@proxmox.com> References: <20250415135045.255272-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v3 07/12] api: {clone, move}_vm: use volume content type assertion helpers X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Make use of the newly introduced content type assertion helpers in the preconditions check paths and the call to `vdisk_alloc` in the API handlers for cloning VMs to another storage and moving a VM disk to another storage with the newly introduced helper. Since the preconditions existed before, adding a content type safeguard at `vdisk_alloc` does not break the API. Signed-off-by: Daniel Kral <d.kral@proxmox.com> --- changes since v2: * rename helper from *_supported to *_available * lower storage_check_enabled to storage_config where possible due to the helper already checking that * change of vdisk_alloc signature with required $vtype PVE/API2/Qemu.pm | 11 +++++------ PVE/QemuServer.pm | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 9dc40e42..e9eb2b2e 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -3969,9 +3969,9 @@ __PACKAGE__->register_method({ if ($storage) { # check if storage is enabled on local node and supports vm images - my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storage); - raise_param_exc({ storage => "storage '$storage' does not support vm images" }) - if !$scfg->{content}->{images}; + my $scfg = PVE::Storage::storage_config($storecfg, $storage); + eval { PVE::Storage::assert_content_type_available($storecfg, $storage, 'images') }; + raise_param_exc({ storage => "$@" }) if $@; if ($target) { # check if storage is available on target node @@ -4352,9 +4352,8 @@ __PACKAGE__->register_method({ die "you can't move to the same storage with same format\n" if $oldstoreid eq $storeid && (!$format || !$oldfmt || $oldfmt eq $format); - my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storeid); - raise_param_exc({ storage => "storage '$storeid' does not support vm images" }) - if !$scfg->{content}->{images}; + eval { PVE::Storage::assert_content_type_available($storecfg, $storeid, 'images') }; + raise_param_exc({ storage => "$@" }) if $@; # this only checks snapshots because $disk is passed! my $snapshotted = PVE::QemuServer::Drive::is_volume_in_use( diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index b6d8cae2..4fb8bff0 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -8491,7 +8491,7 @@ sub clone_disk { $size = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 10); } $newvolid = PVE::Storage::vdisk_alloc( - $storecfg, $storeid, $newvmid, $dst_format, 'any', ($size/1024), { name => $name }); + $storecfg, $storeid, $newvmid, $dst_format, 'images', ($size/1024), { name => $name }); push @$newvollist, $newvolid; PVE::Storage::activate_volumes($storecfg, [$newvolid]); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel