Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-02-02 09:47:13 +03:00
Code Releases Activity

Refactor the resolution of target disk format in own sub

Browse Source 
This will allow use to reuse the code in ImportDisk.pm.
This commit is contained in:
Emmanuel Kasper 2017-06-01 10:26:37 +02:00 committed by Fabian Grünbichler
parent f1c2a53aee
commit 44549149af
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
PVE/QemuServer.pm
View File

@ -6175,20 +6175,11 @@ sub clone_disk {
my ($storeid, $volname) = PVE::Storage::parse_volume_id($drive->{file}); my ($storeid, $volname) = PVE::Storage::parse_volume_id($drive->{file});
$storeid = $storage if $storage; $storeid = $storage if $storage;
my ($defFormat, $validFormats) = PVE::Storage::storage_default_format($storecfg, $storeid); my $dst_format = resolve_dst_disk_format($storecfg, $storeid, $volname, $format);
if (!$format) {
my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
$format = qemu_img_format($scfg, $volname);
}
# test if requested format is supported - else use default
my $supported = grep { $_ eq $format } @$validFormats;
$format = $defFormat if !$supported;
my ($size) = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 3); my ($size) = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 3);
print "create full clone of drive $drivename ($drive->{file})\n"; print "create full clone of drive $drivename ($drive->{file})\n";
$newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $format, undef, ($size/1024)); $newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $dst_format, undef, ($size/1024));
push @$newvollist, $newvolid; push @$newvollist, $newvolid;
PVE::Storage::activate_volumes($storecfg, [$newvolid]); PVE::Storage::activate_volumes($storecfg, [$newvolid]);
@ -6394,6 +6385,26 @@ sub windows_version {
return $winversion; return $winversion;
} }
sub resolve_dst_disk_format {
my ($storecfg, $storeid, $src_volname, $format) = @_;
my ($defFormat, $validFormats) = PVE::Storage::storage_default_format($storecfg, $storeid);
if (!$format) {
# if no target format is specified, use the source disk format as hint
if ($src_volname) {
my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
$format = qemu_img_format($scfg, $src_volname);
} else {
return $defFormat;
}
}
# test if requested format is supported - else use default
my $supported = grep { $_ eq $format } @$validFormats;
$format = $defFormat if !$supported;
return $format;
}
# bash completion helper # bash completion helper
sub complete_backup_archives { sub complete_backup_archives {