From: Fiona Ebner <f.ebner@proxmox.com>
Date: Tue, 12 Sep 2023 09:16:17 +0000 (+0200)
Subject: restore vma: inline one timeout variable and move other closer to usage
X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=61b172d80646f63d8045f1512a7d13be1a3a0bea

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

No functional change intended.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index f7ee768..b52dfbf 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -7366,9 +7366,6 @@ sub restore_vma_archive {
 
     $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 $virtdev_hash = {}; # info about allocated drives
 
@@ -7462,6 +7459,8 @@ sub restore_vma_archive {
 	$fh->close();
     };
 
+    my $oldtimeout;
+
     eval {
 	# enable interrupts
 	local $SIG{INT} =
@@ -7471,7 +7470,7 @@ sub restore_vma_archive {
 	    local $SIG{PIPE} = sub { die "interrupted by signal\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 $line = shift;