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

fix bug #391 - restore: test if requested format is supported

Browse Source
This commit is contained in:
Dietmar Maurer 2013-05-21 12:02:41 +02:00
parent 4f2df3bab1
commit 8fd5743158
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/QemuServer.pm
View File

@ -3584,6 +3584,7 @@ sub restore_update_config_line {
print $outfd "#$line"; print $outfd "#$line";
} elsif ($virtdev && $map->{$virtdev}) { } elsif ($virtdev && $map->{$virtdev}) {
my $di = parse_drive($virtdev, $value); my $di = parse_drive($virtdev, $value);
delete $di->{format}; # format can change on restore
$di->{file} = $map->{$virtdev}; $di->{file} = $map->{$virtdev};
$value = print_drive($vmid, $di); $value = print_drive($vmid, $di);
print $outfd "$virtdev: $value\n"; print $outfd "$virtdev: $value\n";
@ -3810,6 +3811,12 @@ sub restore_vma_archive {
my $d = $virtdev_hash->{$virtdev}; my $d = $virtdev_hash->{$virtdev};
my $alloc_size = int(($d->{size} + 1024 - 1)/1024); my $alloc_size = int(($d->{size} + 1024 - 1)/1024);
my $scfg = PVE::Storage::storage_config($cfg, $d->{storeid}); my $scfg = PVE::Storage::storage_config($cfg, $d->{storeid});
# test if requested format is supported
my ($defFormat, $validFormats) = PVE::Storage::storage_default_format($cfg, $d->{storeid});
my $supported = grep { $_ eq $d->{format} } @$validFormats;
$d->{format} = $defFormat if !$supported;
my $volid = PVE::Storage::vdisk_alloc($cfg, $d->{storeid}, $vmid, my $volid = PVE::Storage::vdisk_alloc($cfg, $d->{storeid}, $vmid,
$d->{format}, undef, $alloc_size); $d->{format}, undef, $alloc_size);
print STDERR "new volume ID is '$volid'\n"; print STDERR "new volume ID is '$volid'\n";