[pve-devel] [PATCH qemu-server 3/4] make use of new helper config aware timeout

Tim Marx t.marx at proxmox.com
Tue Jan 14 12:53:32 CET 2020


Signed-off-by: Tim Marx <t.marx at proxmox.com>
---
 PVE/QemuServer.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a7aff07..992cc7d 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -41,7 +41,7 @@ use PVE::Tools qw(run_command lock_file lock_file_full file_read_firstline dir_g
 
 use PVE::QMPClient;
 use PVE::QemuConfig;
-use PVE::QemuServer::Helpers qw(min_version);
+use PVE::QemuServer::Helpers qw(min_version config_aware_timeout);
 use PVE::QemuServer::Cloudinit;
 use PVE::QemuServer::Machine;
 use PVE::QemuServer::Memory;
@@ -5399,7 +5399,7 @@ sub vm_start {
 	my $cpuunits = defined($conf->{cpuunits}) ? $conf->{cpuunits}
 	                                          : $defaults->{cpuunits};
 
-	my $start_timeout = $timeout // ($conf->{hugepages} || $is_suspended) ? 300 : 30;
+	my $start_timeout = $timeout // config_aware_timeout($conf->{memory}, $conf->{hugepages}, $is_suspended);
 	my %run_params = (
 	    timeout => $statefile ? undef : $start_timeout,
 	    umask => 0077,
-- 
2.20.1




More information about the pve-devel mailing list