From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 1EABF1FF0E3 for ; Tue, 04 Aug 2026 11:04:57 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 2D4F0215E5; Tue, 04 Aug 2026 11:04:46 +0200 (CEST) From: Jakob Klocker To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v2 1/2] qemu-img: drop unused image resize timeout parameter Date: Tue, 4 Aug 2026 11:04:37 +0200 Message-ID: <20260804090438.58491-2-j.klocker@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260804090438.58491-1-j.klocker@proxmox.com> References: <20260804090438.58491-1-j.klocker@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.535 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) KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 1.274 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: BMSBKUAB6QEXRIAVBNLVT7ENN5XLZTKH X-Message-ID-Hash: BMSBKUAB6QEXRIAVBNLVT7ENN5XLZTKH X-MailFrom: jklocker@dev.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 CC: Jakob Klocker X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: qemu_img_resize is only ever called with a hardcoded 10 second timeout, so exposing it as a parameter serves no purpose. Signed-off-by: Jakob Klocker --- src/PVE/Storage/Common.pm | 8 ++++---- src/PVE/Storage/LVMPlugin.pm | 2 +- src/PVE/Storage/Plugin.pm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PVE/Storage/Common.pm b/src/PVE/Storage/Common.pm index 3932aee..725f623 100644 --- a/src/PVE/Storage/Common.pm +++ b/src/PVE/Storage/Common.pm @@ -259,16 +259,16 @@ sub qemu_img_measure { =head3 qemu_img_resize - qemu_img_resize($path, $format, $size, $preallocation, $timeout) + qemu_img_resize($path, $format, $size, $preallocation) Resize a qemu image C<$path> with format C<$format> to a target Kb size C<$size>. -Default timeout C<$timeout> is 10s if not specified. C<$preallocation> allows to specify the preallocation option for the resize operation. +The operation uses a default timeout of 10s. =cut sub qemu_img_resize { - my ($path, $format, $size, $preallocation, $timeout) = @_; + my ($path, $format, $size, $preallocation) = @_; die "format is missing" if !$format; @@ -276,7 +276,7 @@ sub qemu_img_resize { push $cmd->@*, "--preallocation=$preallocation" if $preallocation; push $cmd->@*, '-f', $format, $path, $size; - $timeout = 10 if !$timeout; + my $timeout = 10; run_command($cmd, timeout => $timeout); } diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index b8646c2..768ff95 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -1081,7 +1081,7 @@ sub volume_resize { if (!$running && $format eq 'qcow2') { my $preallocation = PVE::Storage::Plugin::preallocation_cmd_opt($scfg, $format); - PVE::Storage::Common::qemu_img_resize($path, $format, $size, $preallocation, 10); + PVE::Storage::Common::qemu_img_resize($path, $format, $size, $preallocation); } return 1; diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 4f69f9b..082355d 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1373,7 +1373,7 @@ sub volume_resize { my $format = ($class->parse_volname($volname))[6]; my $preallocation = preallocation_cmd_opt($scfg, $format); - PVE::Storage::Common::qemu_img_resize($path, $format, $size, $preallocation, 10); + PVE::Storage::Common::qemu_img_resize($path, $format, $size, $preallocation); return undef; } -- 2.47.3