From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id CD4B11FF13A for ; Wed, 22 Jul 2026 16:02:29 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 65B31214F1; Wed, 22 Jul 2026 16:02:29 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 1/7] rename config_aware_timeout to config_aware_start_timeout Date: Wed, 22 Jul 2026 16:01:43 +0200 Message-ID: <20260722140149.296952-2-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260722140149.296952-1-d.kral@proxmox.com> References: <20260722140149.296952-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784728917761 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.236 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: B7TZNJXRROTQAJQ6SL7JJTKGLTN5GVG7 X-Message-ID-Hash: B7TZNJXRROTQAJQ6SL7JJTKGLTN5GVG7 X-MailFrom: d.kral@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The config_aware_timeout() helper is only used to estimate an appropriate timeout value for VM startups. This is done in preperation of another patch, which introduces a helper to compute the shutdown timeout. Signed-off-by: Daniel Kral --- src/PVE/QemuMigrate.pm | 4 ++-- src/PVE/QemuServer.pm | 5 +++-- src/PVE/QemuServer/Helpers.pm | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm index 8da6f15d..afe0f777 100644 --- a/src/PVE/QemuMigrate.pm +++ b/src/PVE/QemuMigrate.pm @@ -31,7 +31,7 @@ use PVE::QemuServer::Agent; use PVE::QemuServer::BlockJob; use PVE::QemuServer::CPUConfig; use PVE::QemuServer::Drive qw(checked_volume_format); -use PVE::QemuServer::Helpers qw(min_version); +use PVE::QemuServer::Helpers qw(config_aware_start_timeout min_version); use PVE::QemuServer::Machine; use PVE::QemuServer::Monitor qw(mon_cmd vm_qmp_peer); use PVE::QemuServer::Memory qw(get_current_memory); @@ -1157,7 +1157,7 @@ sub phase2_start_remote_cluster { # like regular start but with some overhead accounted for my $memory = get_current_memory($self->{vmconf}->{memory}); - my $timeout = PVE::QemuServer::Helpers::config_aware_timeout($self->{vmconf}, $memory) + 10; + my $timeout = config_aware_start_timeout($self->{vmconf}, $memory) + 10; my $res = PVE::Tunnel::write_tunnel($self->{tunnel}, $timeout, "start", $params); diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 191ae549..5b9f5753 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -57,7 +57,7 @@ use PVE::QemuServer::Blockdev; use PVE::QemuServer::BlockJob; use PVE::QemuServer::Cfg2Cmd; use PVE::QemuServer::Helpers - qw(config_aware_timeout get_iscsi_initiator_name get_host_arch min_version kvm_user_version windows_version); + qw(config_aware_start_timeout get_iscsi_initiator_name get_host_arch min_version kvm_user_version windows_version); use PVE::QemuServer::Cloudinit; use PVE::QemuServer::CGroup; use PVE::QemuServer::CPUConfig qw( @@ -5675,7 +5675,8 @@ sub vm_start_nolock { ); my $memory = get_current_memory($conf->{memory}); - $start_timeout = $params->{timeout} // config_aware_timeout($conf, $memory, $resume); + $start_timeout = $params->{timeout} + // config_aware_start_timeout($conf, $memory, $resume); push $cmd->@*, $state_cmdline->@*; diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index dd17eef5..de9bc098 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -15,7 +15,7 @@ use PVE::Tools; use base 'Exporter'; our @EXPORT_OK = qw( min_version - config_aware_timeout + config_aware_start_timeout get_iscsi_initiator_name kvm_user_version parse_number_sets @@ -261,7 +261,7 @@ sub version_cmp { return 0; } -sub config_aware_timeout { +sub config_aware_start_timeout { my ($config, $memory, $is_suspended) = @_; my $timeout = 30; -- 2.47.3