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 v1:
- split bug fix from refactoring (here)
- this was patch #3 and #4 before, but squashed them here as they are
very related to each other
PVE/API2/Qemu.pm | 10 +++++-----
PVE/QemuServer.pm | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 92d24443..8ce266a3 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -3853,8 +3853,8 @@ __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};
+ eval { PVE::Storage::assert_content_type_supported($storecfg,
$storage, 'images') };
+ raise_param_exc({ storage => "$@" }) if $@;
if ($target) {
# check if storage is available on target node
@@ -4235,9 +4235,9 @@ __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};
+ PVE::Storage::storage_check_enabled($storecfg, $storeid);
+ eval { PVE::Storage::assert_content_type_supported($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 07b7785f..0cc3285f 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8248,6 +8248,7 @@ sub clone_disk {
}
$newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid,
$dst_format, ($size/1024), {
name => $name,
+ vtype => 'images',
});
push @$newvollist, $newvolid;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
