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 38D411FF141 for ; Tue, 30 Jun 2026 13:04:51 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 208702141B; Tue, 30 Jun 2026 13:04:50 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v3 2/3] move get_running_qemu_version to QMPHelpers Date: Tue, 30 Jun 2026 13:04:38 +0200 Message-ID: <20260630110446.314299-3-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260630110446.314299-1-m.sandoval@proxmox.com> References: <20260630110446.314299-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1782817474358 X-SPAM-LEVEL: Spam detection results: 0 DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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: ONMDNV4UZ2ALIRBWVK2TL7PEYQHJNECX X-Message-ID-Hash: ONMDNV4UZ2ALIRBWVK2TL7PEYQHJNECX X-MailFrom: m.sandoval@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: We will add a new helper for retrieving the package version in the next commit and it makes sense to keep them together. Since the fn is in a different module now one also needs to add it to the mock modules. This will be relevant in the next commit when query-version is called as part of VM startup. Signed-off-by: Maximiliano Sandoval --- src/PVE/QemuServer.pm | 9 ++------- src/PVE/QemuServer/QMPHelpers.pm | 6 ++++++ src/test/MigrationTest/QmMock.pm | 5 +++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index cdf66e89..12ac5d2d 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -89,7 +89,8 @@ use PVE::QemuServer::OVMF; use PVE::QemuServer::PCI qw(print_pci_addr print_pcie_addr print_pcie_root_port parse_hostpci); use PVE::QemuServer::PCI::Mdev; use PVE::QemuServer::QemuImage; -use PVE::QemuServer::QMPHelpers qw(qemu_deviceadd qemu_devicedel qemu_objectadd qemu_objectdel); +use PVE::QemuServer::QMPHelpers + qw(get_running_qemu_version qemu_deviceadd qemu_devicedel qemu_objectadd qemu_objectdel); use PVE::QemuServer::QSD; use PVE::QemuServer::RNG qw(parse_rng print_rng_device_commandline print_rng_object_commandline); use PVE::QemuServer::RunState; @@ -8062,12 +8063,6 @@ no_data_clone: return $disk; } -sub get_running_qemu_version { - my ($vmid) = @_; - my $res = mon_cmd($vmid, "query-version"); - return "$res->{qemu}->{major}.$res->{qemu}->{minor}"; -} - sub qemu_use_old_bios_files { my ($machine_type) = @_; diff --git a/src/PVE/QemuServer/QMPHelpers.pm b/src/PVE/QemuServer/QMPHelpers.pm index b4c6d1e7..4275ebb2 100644 --- a/src/PVE/QemuServer/QMPHelpers.pm +++ b/src/PVE/QemuServer/QMPHelpers.pm @@ -8,6 +8,7 @@ use PVE::QemuServer::Monitor qw(mon_cmd); use base 'Exporter'; our @EXPORT_OK = qw( + get_running_qemu_version qemu_deviceadd qemu_devicedel qemu_objectadd @@ -18,6 +19,11 @@ sub nbd_stop($vmid) { mon_cmd($vmid, 'nbd-server-stop', timeout => 25); } +sub get_running_qemu_version($vmid) { + my $res = mon_cmd($vmid, 'query-version'); + return "$res->{qemu}->{major}.$res->{qemu}->{minor}"; +} + sub qemu_deviceadd($vmid, $devicefull) { $devicefull = "driver=" . $devicefull; diff --git a/src/test/MigrationTest/QmMock.pm b/src/test/MigrationTest/QmMock.pm index c6fc1f50..8f8899dc 100644 --- a/src/test/MigrationTest/QmMock.pm +++ b/src/test/MigrationTest/QmMock.pm @@ -82,6 +82,11 @@ $qemu_server_helpers_module->mock( }, ); +my $qemu_server_qmp_helpers_module = Test::MockModule->new("PVE::QemuServer::QMPHelpers"); +$qemu_server_qmp_helpers_module->mock( + mon_cmd => \&mocked_mon_cmd, +); + my $qemu_server_runstate_module = Test::MockModule->new("PVE::QemuServer::RunState"); $qemu_server_runstate_module->mock( get_cleanup_flag_path => sub { -- 2.47.3