From d52b8b77f8aaa20521db0b52d3bc6bbcda73cd94 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 11 Jun 2013 07:22:13 +0200 Subject: [PATCH] simplify previous patch --- PVE/API2/Qemu.pm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 5b88ee7..39a18ed 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -130,7 +130,6 @@ my $create_disks = sub { my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); - my $foundvolid = 1; my $volid_is_new = 1; if ($conf->{$ds}) { @@ -138,18 +137,15 @@ my $create_disks = sub { $volid_is_new = undef if $olddrive->{file} && $olddrive->{file} eq $volid; } - if($volid_is_new){ + if ($volid_is_new) { PVE::Storage::activate_volumes($storecfg, [ $volid ]) if $storeid; - my $size = undef; - eval { - $size = PVE::Storage::volume_size_info($storecfg, $volid); - die if !$size; - $disk->{size} = $size; - }; - $foundvolid = undef if $@; - die "volume $volid does not exists\n" if (!(-f $path || -b $path || $foundvolid)); + my $size = PVE::Storage::volume_size_info($storecfg, $volid); + + die "volume $volid does not exists\n" if !$size; + + $disk->{size} = $size; } $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); -- 2.39.2