proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-25 11:15:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix CD eject

Browse Source
This commit is contained in:
Dietmar Maurer 2012-02-03 10:49:37 +01:00
parent ae57f6b352
commit 09d0ee6473
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/API2/Qemu.pm
View File

@ -65,7 +65,9 @@ my $check_storage_access = sub {
my $volid = $drive->{file}; my $volid = $drive->{file};
if (!$isCDROM && ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/)) { if (!$volid || $volid eq 'none') {
# nothing to check
} elsif (!$isCDROM && ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/)) {
my ($storeid, $size) = ($2 || $default_storage, $3); my ($storeid, $size) = ($2 || $default_storage, $3);
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
$rpcenv->check_storage_perm($authuser, $vmid, $pool, $storeid, [ 'Datastore.AllocateSpace' ]); $rpcenv->check_storage_perm($authuser, $vmid, $pool, $storeid, [ 'Datastore.AllocateSpace' ]);
@ -89,7 +91,9 @@ my $create_disks = sub {
my $volid = $disk->{file}; my $volid = $disk->{file};
if ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/) { if (!$volid || $volid eq 'none') {
$res->{$ds} = $settings->{$ds};
} elsif ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/) {
my ($storeid, $size) = ($2 || $default_storage, $3); my ($storeid, $size) = ($2 || $default_storage, $3);
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
my $defformat = PVE::Storage::storage_default_format($storecfg, $storeid); my $defformat = PVE::Storage::storage_default_format($storecfg, $storeid);
@ -103,7 +107,7 @@ my $create_disks = sub {
} else { } else {
my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid, $pool); my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid, $pool);
die "image '$path' does not exists\n" if (!(-f $path || -b $path)); die "image '$path' does not exists\n" if (!(-f $path || -b $path));
$res->{$ds} = $settings->{ds}; $res->{$ds} = $settings->{$ds};
} }
}); });