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 D380162F35 for ; Wed, 23 Feb 2022 12:16:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CA96B2D862 for ; Wed, 23 Feb 2022 12:16:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 3F6982D859 for ; Wed, 23 Feb 2022 12:16:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 17A2B46D07 for ; Wed, 23 Feb 2022 12:16:09 +0100 (CET) From: Matthias Heiserer To: pve-devel@lists.proxmox.com Date: Wed, 23 Feb 2022 12:15:58 +0100 Message-Id: <20220223111558.369945-1-m.heiserer@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH qemu-server v2] fix 3886: QEMU restore: verify storage allows images before writing 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: Wed, 23 Feb 2022 11:16:39 -0000 When restoring a backup and the storage the disks would be created on doesn't allow 'images', the process errors without cleanup. This is the same behaviour we currently have when the storage is disabled. Signed-off-by: Matthias Heiserer --- PVE/QemuServer.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a99f1a5..aaada7a 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6243,6 +6243,9 @@ my $parse_backup_hints = sub { } elsif (!$storeid) { $storeid = 'local'; } + my $scfg = PVE::Storage::storage_config($storecfg, $storeid); + die "Content type 'images' is not available on storage '$storeid'\n" + if !$scfg->{content}->{images}; $format = 'raw' if !$format; $devinfo->{$devname}->{devname} = $devname; $devinfo->{$devname}->{virtdev} = $virtdev; @@ -6264,6 +6267,8 @@ my $parse_backup_hints = sub { $storeid = $options->{storage} if defined ($options->{storage}); my $scfg = PVE::Storage::storage_config($storecfg, $storeid); my $format = qemu_img_format($scfg, $volname); # has 'raw' fallback + die "Content type 'images' is not available on storage '$storeid'\n" + if !$scfg->{content}->{images}; $virtdev_hash->{$virtdev} = { format => $format, -- 2.30.2