proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-29 15:24:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: create disks: live import: use format from storage layer

Browse Source 
Avoid that file_size_info() does auto-detection via qemu-img.

This also adapts to the new argument order.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-12-06 17:25:35 +01:00 committed by Fabian Grünbichler
parent 7dede85815
commit c8ed1ac24e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/API2/Qemu.pm
View File

@ -438,9 +438,9 @@ my sub create_disks : prototype($$$$$$$$$$$) {
my ($source_storage, $source_volid) = PVE::Storage::parse_volume_id($source, 1); my ($source_storage, $source_volid) = PVE::Storage::parse_volume_id($source, 1);
if ($source_storage) { # PVE-managed volume if ($source_storage) { # PVE-managed volume
my ($vtype, undef, undef, undef, undef, undef, $fmt) my ($vtype, $source_format) = (checked_parse_volname($storecfg, $source))[0,6];
= PVE::Storage::parse_volname($storecfg, $source); my $needs_extraction =
my $needs_extraction = PVE::QemuServer::Helpers::needs_extraction($vtype, $fmt); PVE::QemuServer::Helpers::needs_extraction($vtype, $source_format);
my $untrusted = $vtype eq 'import' ? 1 : 0; my $untrusted = $vtype eq 'import' ? 1 : 0;
if ($needs_extraction) { if ($needs_extraction) {
print "extracting $source\n"; print "extracting $source\n";
@ -460,7 +460,7 @@ my sub create_disks : prototype($$$$$$$$$$$) {
my $path = PVE::Storage::path($storecfg, $source) my $path = PVE::Storage::path($storecfg, $source)
or die "failed to get a path for '$source'\n"; or die "failed to get a path for '$source'\n";
# check potentially untrusted image file for import vtype # check potentially untrusted image file for import vtype
($size, my $source_format) = PVE::Storage::file_size_info($path, undef, $untrusted); $size = PVE::Storage::file_size_info($path, undef, $source_format, $untrusted);
die "could not get file size of $path\n" if !$size; die "could not get file size of $path\n" if !$size;
$live_import_mapping->{$ds} = { $live_import_mapping->{$ds} = {
path => $path, path => $path,