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 5A3CD1FF15E for <inbox@lore.proxmox.com>; Tue, 11 Feb 2025 17:10:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4B7C536CF; Tue, 11 Feb 2025 17:09:14 +0100 (CET) From: Daniel Kral <d.kral@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 11 Feb 2025 17:08:08 +0100 Message-Id: <20250211160825.254167-15-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 09/15] cfg2cmd: improve error message for invalid volume content type 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> Improve the error message when a VM start fails due to a volume storage not supporting the volume's required content type by prefixing it with the disk handle (e.g. scsi0). Signed-off-by: Daniel Kral <d.kral@proxmox.com> --- changes since v1: - none except relocation of helper PVE/QemuServer.pm | 17 +++-------------- .../unsupported-storage-content-type.conf | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 2f14bb52..07b7785f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3827,7 +3827,9 @@ sub config_to_command { my ($ds, $drive) = @_; if (PVE::Storage::parse_volume_id($drive->{file}, 1)) { - check_volume_storage_type($storecfg, $drive->{file}); + eval { PVE::Storage::assert_volume_type_supported($storecfg, $drive->{file}) }; + die "$ds: $@" if $@; + push @$vollist, $drive->{file}; } @@ -8708,19 +8710,6 @@ sub vm_is_paused { ); } -sub check_volume_storage_type { - my ($storecfg, $vol) = @_; - - my ($storeid, $volname) = PVE::Storage::parse_volume_id($vol); - my $scfg = PVE::Storage::storage_config($storecfg, $storeid); - my ($vtype) = PVE::Storage::parse_volname($storecfg, $vol); - - die "storage '$storeid' does not support content-type '$vtype'\n" - if !$scfg->{content}->{$vtype}; - - return 1; -} - sub add_nets_bridge_fdb { my ($conf, $vmid) = @_; diff --git a/test/cfg2cmd/unsupported-storage-content-type.conf b/test/cfg2cmd/unsupported-storage-content-type.conf index e33165a8..e0903eff 100644 --- a/test/cfg2cmd/unsupported-storage-content-type.conf +++ b/test/cfg2cmd/unsupported-storage-content-type.conf @@ -1,3 +1,3 @@ # TEST: Unsupported storage content type in a volume disk -# EXPECT_ERROR: storage 'noimages' does not support content-type 'images' +# EXPECT_ERROR: scsi0: storage 'noimages' does not support content type 'images' scsi0: noimages:8006/vm-8006-disk-0.raw,iothread=1,size=32G -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel