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 AB4F61FF15E
for <inbox@lore.proxmox.com>; Tue, 11 Feb 2025 17:09:41 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 4BF5533FC;
Tue, 11 Feb 2025 17:08:46 +0100 (CET)
From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 11 Feb 2025 17:08:11 +0100
Message-Id: <20250211160825.254167-18-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 12/15] api: import{disk,
ovf}: 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 importing VM disks or importing OVF manifests as VMs.
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:
- made it more apparent that this also affects importovf and fixed a bug
here
PVE/CLI/qm.pm | 10 +++-------
PVE/QemuServer/ImportDisk.pm | 5 +++--
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 58167050..069d3e30 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -607,10 +607,7 @@ __PACKAGE__->register_method ({
my $storecfg = PVE::Storage::config();
PVE::Storage::storage_check_enabled($storecfg, $storeid);
-
- my $target_storage_config = PVE::Storage::storage_config($storecfg, $storeid);
- die "storage $storeid does not support vm images\n"
- if !$target_storage_config->{content}->{images};
+ PVE::Storage::assert_content_type_supported($storecfg, $storeid, 'images');
print "importing disk '$source' to VM $vmid ...\n";
@@ -756,9 +753,8 @@ __PACKAGE__->register_method ({
die "$ovf_file: non-existent or non-regular file\n" if (! -f $ovf_file);
my $storecfg = PVE::Storage::config();
- 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);
+ PVE::Storage::assert_content_type_supported($storecfg, $storeid, 'images');
my $parsed = PVE::GuestImport::OVF::parse_ovf($ovf_file);
diff --git a/PVE/QemuServer/ImportDisk.pm b/PVE/QemuServer/ImportDisk.pm
index 22dbd4fc..1d28d2e1 100755
--- a/PVE/QemuServer/ImportDisk.pm
+++ b/PVE/QemuServer/ImportDisk.pm
@@ -28,8 +28,9 @@ sub do_import {
warn "format '$format' is not supported by the target storage - using '$dst_format' instead\n"
if $format && $format ne $dst_format;
- my $dst_volid = PVE::Storage::vdisk_alloc(
- $storecfg, $storage_id, $vmid, $dst_format, $src_size / 1024);
+ my $dst_volid = PVE::Storage::vdisk_alloc($storecfg, $storage_id, $vmid, $dst_format, $src_size / 1024, {
+ vtype => 'images',
+ });
my $zeroinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $dst_volid);
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel