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.k...@proxmox.com>
---
changes since v2:
* rename helper from *_supported to *_available
* lower storage_check_enabled to storage_config where possible due to
the helper already checking that
* change of vdisk_alloc signature with required $vtype
PVE/API2/Qemu.pm | 11 +++++------
PVE/QemuServer.pm | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 9dc40e42..e9eb2b2e 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -3969,9 +3969,9 @@ __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};
+ my $scfg = PVE::Storage::storage_config($storecfg, $storage);
+ eval { PVE::Storage::assert_content_type_available($storecfg,
$storage, 'images') };
+ raise_param_exc({ storage => "$@" }) if $@;
if ($target) {
# check if storage is available on target node
@@ -4352,9 +4352,8 @@ __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};
+ eval { PVE::Storage::assert_content_type_available($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 b6d8cae2..4fb8bff0 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8491,7 +8491,7 @@ sub clone_disk {
$size = PVE::Storage::volume_size_info($storecfg, $drive->{file},
10);
}
$newvolid = PVE::Storage::vdisk_alloc(
- $storecfg, $storeid, $newvmid, $dst_format, 'any', ($size/1024), {
name => $name });
+ $storecfg, $storeid, $newvmid, $dst_format, 'images', ($size/1024),
{ name => $name });
push @$newvollist, $newvolid;
PVE::Storage::activate_volumes($storecfg, [$newvolid]);
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
