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

restore vma: inline one timeout variable and move other closer to usage

Browse Source 
No functional change intended.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2023-09-12 11:16:17 +02:00 committed by Thomas Lamprecht
parent e003f28404
commit 61b172d806
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/QemuServer.pm
View File

@ -7366,9 +7366,6 @@ sub restore_vma_archive {
$add_pipe->(['vma', 'extract', '-v', '-r', $mapfifo, $readfrom, $tmpdir]); $add_pipe->(['vma', 'extract', '-v', '-r', $mapfifo, $readfrom, $tmpdir]);
my $oldtimeout;
my $timeout = 5; # for reading the VMA header - might hang with a corrupted one
my $devinfo = {}; # info about drives included in backup my $devinfo = {}; # info about drives included in backup
my $virtdev_hash = {}; # info about allocated drives my $virtdev_hash = {}; # info about allocated drives
@ -7462,6 +7459,8 @@ sub restore_vma_archive {
$fh->close(); $fh->close();
}; };
my $oldtimeout;
eval { eval {
# enable interrupts # enable interrupts
local $SIG{INT} = local $SIG{INT} =
@ -7471,7 +7470,7 @@ sub restore_vma_archive {
local $SIG{PIPE} = sub { die "interrupted by signal\n"; }; local $SIG{PIPE} = sub { die "interrupted by signal\n"; };
local $SIG{ALRM} = sub { die "got timeout\n"; }; local $SIG{ALRM} = sub { die "got timeout\n"; };
$oldtimeout = alarm($timeout); $oldtimeout = alarm(5); # for reading the VMA header - might hang with a corrupted one
my $parser = sub { my $parser = sub {
my $line = shift; my $line = shift;