Am 12.02.25 um 14:02 schrieb Markus Frank:
> Add an option to choose a file format (qcow2, raw, vmdk) when restoring
> a vm backup to file based storage. This options allows all disks to be
> recreated with the specified file format if supported by the target
> storage.
>
> Signed-off-by: Markus Frank <m.fr...@proxmox.com>
> ---
> PVE/API2/Qemu.pm | 6 ++++++
> PVE/CLI/qmrestore.pm | 4 ++++
> PVE/QemuServer.pm | 10 +++++++---
> 3 files changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 295260e7..617dbe45 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -1013,6 +1013,10 @@ __PACKAGE__->register_method({
> default => 0,
> description => "Start VM after it was created
> successfully.",
> },
> + 'disk-format' =>
> get_standard_option('pve-storage-qm-image-format', {
> + optional => 1,
requires => 'archive',
> + description => "Image format used for all VM disks when
> restoring.",
I'd rather say "Preferred image format...", because if the storage
doesn't support it, it won't be used.
> + }),
> 'import-working-storage' =>
> get_standard_option('pve-storage-id', {
> description => "A file-based storage with 'images'
> content-type enabled, which"
> ." is used as an intermediary extraction storage during
> import. Defaults to"
> @@ -1046,6 +1050,7 @@ __PACKAGE__->register_method({
> my $storage = extract_param($param, 'storage');
> my $unique = extract_param($param, 'unique');
> my $live_restore = extract_param($param, 'live-restore');
> + my $disk_format = extract_param($param, 'disk-format');
> my $extraction_storage = extract_param($param,
> 'import-working-storage');
>
> if (defined(my $ssh_keys = $param->{sshkeys})) {
> @@ -1143,6 +1148,7 @@ __PACKAGE__->register_method({
> unique => $unique,
> bwlimit => $bwlimit,
> live => $live_restore,
> + disk_format => $disk_format,
> override_conf => $param,
> };
> if (my $volid = $archive->{volid}) {
> diff --git a/PVE/CLI/qmrestore.pm b/PVE/CLI/qmrestore.pm
> index a47648bd..68c23db5 100755
> --- a/PVE/CLI/qmrestore.pm
> +++ b/PVE/CLI/qmrestore.pm
> @@ -64,6 +64,10 @@ __PACKAGE__->register_method({
> type => 'boolean',
> description => "Start the VM immediately from the backup and
> restore in background. PBS only.",
> },
> + 'disk-format' => get_standard_option('pve-storage-qm-image-format',
> {
missing
use PVE::Storage; # for 'pve-storage-qm-image-format' standard option
which registers the option, at the beginning of the module
> + optional => 1,
> + description => "Restore all VM disks with the specified image
> format.",
I'd rather say "Preferred image format...", because if the storage
doesn't support it, it won't be used.
> + }),
> },
> },
> returns => {
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 808c0e1c..63836399 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -6660,7 +6660,7 @@ my $parse_backup_hints = sub {
> #
> # Returns: { $virtdev => $volid }
> my $restore_allocate_devices = sub {
> - my ($storecfg, $virtdev_hash, $vmid) = @_;
> + my ($storecfg, $virtdev_hash, $vmid, $disk_format) = @_;
>
> my $map = {};
> foreach my $virtdev (sort keys %$virtdev_hash) {
> @@ -6670,6 +6670,10 @@ my $restore_allocate_devices = sub {
> my $storeid = $d->{storeid};
> my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
>
> + if ($disk_format) {
> + $d->{format} = $disk_format;
Rather than overriding the format hint, we could consider both:
check if $disk_format is supported, if yes, use that
else, check if $d->{format} is supported, if yes, use that
else, use default format
But arguably quite an edge case, I'm also fine with the behavior in this
patch.
> + }
> +
> # test if requested format is supported
> my ($defFormat, $validFormats) =
> PVE::Storage::storage_default_format($storecfg, $storeid);
> my $supported = grep { $_ eq $d->{format} } @$validFormats;
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
