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

qmrestore: removed short timeout

Browse Source
This commit is contained in:
Dietmar Maurer 2014-04-17 10:37:46 +02:00
parent e44e593767
commit 3cf90d7a40
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/QemuServer.pm
View File

@ -4157,6 +4157,10 @@ sub restore_vma_archive {
my ($dev_id, $size, $devname) = ($1, $2, $3); my ($dev_id, $size, $devname) = ($1, $2, $3);
$devinfo->{$devname} = { size => $size, dev_id => $dev_id }; $devinfo->{$devname} = { size => $size, dev_id => $dev_id };
} elsif ($line =~ m/^CTIME: /) { } elsif ($line =~ m/^CTIME: /) {
# we correctly received the vma config, so we can disable
# the timeout now for disk allocation (set to 10 minutes, so
# that we always timeout if something goes wrong)
alarm(600);
&$print_devmap(); &$print_devmap();
print $fifofh "done\n"; print $fifofh "done\n";
my $tmp = $oldtimeout || 0; my $tmp = $oldtimeout || 0;

2
changelog.Debian
View File

@ -4,6 +4,8 @@ qemu-server (3.1-16) unstable; urgency=low
* fix bug #510: move_disk - don't delete disk if used in a previous snasphot * fix bug #510: move_disk - don't delete disk if used in a previous snasphot
* qmrestore: removed short timeout
-- Proxmox Support Team <support@proxmox.com> Thu, 17 Apr 2014 09:29:26 +0200 -- Proxmox Support Team <support@proxmox.com> Thu, 17 Apr 2014 09:29:26 +0200
qemu-server (3.1-15) unstable; urgency=low qemu-server (3.1-15) unstable; urgency=low