From a113a58a64e53cb474be13e325456b5bafda948a Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 19 Mar 2020 11:48:19 +0100 Subject: [PATCH 1/1] vzdump prepare: refactor and code cleanup Signed-off-by: Thomas Lamprecht --- PVE/VZDump/QemuServer.pm | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 2722f25b..b7d0d172 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -108,28 +108,25 @@ sub prepare { my $drive = $drivehash->{$ds}; my $volid = $drive->{file}; - - my $path; - my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); + + my $path = $volid; if ($storeid) { $path = PVE::Storage::path($self->{storecfg}, $volid); - } else { - $path = $volid; } - next if !$path; - my $format = undef; - my $size = undef; - - eval{ - ($size, $format) = PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5); - }; + my ($size, $format) = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5) }; die "no such volume '$volid'\n" if $@; - my $diskinfo = { path => $path , volid => $volid, storeid => $storeid, - format => $format, virtdev => $ds, qmdevice => "drive-$ds" }; + my $diskinfo = { + path => $path, + volid => $volid, + storeid => $storeid, + format => $format, + virtdev => $ds, + qmdevice => "drive-$ds", + }; if (-b $path) { $diskinfo->{type} = 'block'; -- 2.39.5