yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file_size_info: add missing format parameters

Browse Source 
these calls would print spurious warnings otherwise.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2024-12-09 11:48:01 +01:00
parent a8d246e784
commit f1ea2c5c89
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/PVE/GuestImport.pm
View File

@ -36,6 +36,8 @@ sub extract_disk_from_import_file {
die "cannot extract $volid - invalid volname $volname\n"; die "cannot extract $volid - invalid volname $volname\n";
} }
die "cannot determine format of '$volid'\n" if !$inner_fmt;
my $ova_path = PVE::Storage::path($cfg, $archive_volid); my $ova_path = PVE::Storage::path($cfg, $archive_volid);
my $tmpdir = PVE::Storage::get_image_dir($cfg, $target_storeid, $vmid); my $tmpdir = PVE::Storage::get_image_dir($cfg, $target_storeid, $vmid);
@ -63,7 +65,7 @@ sub extract_disk_from_import_file {
} }
# check potentially untrusted image file! # check potentially untrusted image file!
PVE::Storage::file_size_info($source_path, undef, undef, 1); PVE::Storage::file_size_info($source_path, undef, $inner_fmt, 1);
# create temporary 1M image that will get overwritten by the rename # create temporary 1M image that will get overwritten by the rename
# to reserve the filename and take care of locking # to reserve the filename and take care of locking

2
src/PVE/Storage.pm
View File

@ -300,7 +300,7 @@ sub volume_size_info {
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
return $plugin->volume_size_info($scfg, $storeid, $volname, $timeout); return $plugin->volume_size_info($scfg, $storeid, $volname, $timeout);
} elsif ($volid =~ m|^(/.+)$| && -e $volid) { } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
return file_size_info($volid, $timeout); return file_size_info($volid, $timeout, 'auto-detect');
} else { } else {
return 0; return 0;
} }

2
src/PVE/Storage/ESXiPlugin.pm
View File

@ -538,7 +538,7 @@ sub volume_size_info {
return 0 if $volname =~ /\.vmx$/; return 0 if $volname =~ /\.vmx$/;
my $filename = $class->path($scfg, $volname, $storeid, undef); my $filename = $class->path($scfg, $volname, $storeid, undef);
return PVE::Storage::Plugin::file_size_info($filename, $timeout); return PVE::Storage::Plugin::file_size_info($filename, $timeout, 'auto-detect');
} }
sub volume_snapshot { sub volume_snapshot {