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 A37A71FF15E for <inbox@lore.proxmox.com>; Tue, 11 Feb 2025 17:10:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 10D9538A3; Tue, 11 Feb 2025 17:09:15 +0100 (CET) From: Daniel Kral <d.kral@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 11 Feb 2025 17:08:09 +0100 Message-Id: <20250211160825.254167-16-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211160825.254167-1-d.kral@proxmox.com> References: <20250211160825.254167-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 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 v2 10/15] 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 v1: - split bug fix from refactoring (here) - this was patch #3 and #4 before, but squashed them here as they are very related to each other PVE/API2/Qemu.pm | 10 +++++----- PVE/QemuServer.pm | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 92d24443..8ce266a3 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -3853,8 +3853,8 @@ __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}; + eval { PVE::Storage::assert_content_type_supported($storecfg, $storage, 'images') }; + raise_param_exc({ storage => "$@" }) if $@; if ($target) { # check if storage is available on target node @@ -4235,9 +4235,9 @@ __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}; + PVE::Storage::storage_check_enabled($storecfg, $storeid); + eval { PVE::Storage::assert_content_type_supported($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 07b7785f..0cc3285f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -8248,6 +8248,7 @@ sub clone_disk { } $newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $dst_format, ($size/1024), { name => $name, + vtype => 'images', }); push @$newvollist, $newvolid; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel