From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C0EEF1FF16F for ; Tue, 15 Apr 2025 15:59:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 76815A0E9; Tue, 15 Apr 2025 15:59:35 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Tue, 15 Apr 2025 15:50:41 +0200 Message-Id: <20250415135045.255272-24-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 container v3 07/11] alloc_disk: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Make use of the newly introduced content type assertion helpers in the precondition check path and the call to `vdisk_alloc` in the wrapper for allocating container's disks. Signed-off-by: Daniel Kral --- changes since v2: * rename helper from *_supported to *_available * lower/remove storage_check_enabled to storage_config where possible due to the helper already checking that * change of vdisk_alloc signature with required $vtype src/PVE/LXC.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 4209233..799aa9a 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -2173,8 +2173,7 @@ sub alloc_disk { my $format = 'raw'; my $do_format = 0; - die "storage '$storage' does not support content type 'rootdir'\n" - if !$scfg->{content}->{rootdir}; + PVE::Storage::assert_content_type_available($storecfg, $storage, 'rootdir'); my $is_unsized_on_path = $scfg->{path} && $size_kb <= 0; my $is_btrfs_quotas = $scfg->{type} eq 'btrfs' && $scfg->{quotas}; @@ -2187,7 +2186,8 @@ sub alloc_disk { $do_format = 1; } - $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, $format, $size_kb); + $volid = PVE::Storage::vdisk_alloc( + $storecfg, $storage, $vmid, $format, 'rootdir', $size_kb); format_disk($storecfg, $volid, $root_uid, $root_gid) if $do_format; }; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel