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

simplify previous patch

Browse Source
This commit is contained in:
Dietmar Maurer 2013-06-11 07:22:13 +02:00
parent 09a8989501
commit d52b8b77f8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PVE/API2/Qemu.pm
View File

@ -130,7 +130,6 @@ my $create_disks = sub {
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
my $foundvolid = 1;
my $volid_is_new = 1; my $volid_is_new = 1;
if ($conf->{$ds}) { if ($conf->{$ds}) {
@ -138,18 +137,15 @@ my $create_disks = sub {
$volid_is_new = undef if $olddrive->{file} && $olddrive->{file} eq $volid; $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; 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); $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);