From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 620B91FF191 for ; Tue, 9 Sep 2025 15:27:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDC4CAB87; Tue, 9 Sep 2025 15:26:55 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 9 Sep 2025 15:26:02 +0200 Message-ID: <20250909132613.96402-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250909132613.96402-1-f.ebner@proxmox.com> References: <20250909132613.96402-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1757424356168 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.023 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v2 5/5] agent: move guest agent format and parsing to agent module X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Fiona Ebner --- src/PVE/API2/Qemu.pm | 4 +-- src/PVE/QemuConfig.pm | 2 +- src/PVE/QemuMigrate.pm | 3 +- src/PVE/QemuServer.pm | 54 ++---------------------------------- src/PVE/QemuServer/Agent.pm | 54 ++++++++++++++++++++++++++++++++++++ src/PVE/VZDump/QemuServer.pm | 3 +- 6 files changed, 63 insertions(+), 57 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index c7929dbb..11d9091e 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -3324,7 +3324,7 @@ __PACKAGE__->register_method({ $status->{spice} = 1 if $spice; $status->{clipboard} = $vga->{clipboard}; } - $status->{agent} = 1 if PVE::QemuServer::get_qga_key($conf, 'enabled'); + $status->{agent} = 1 if PVE::QemuServer::Agent::get_qga_key($conf, 'enabled'); return $status; }, @@ -4789,7 +4789,7 @@ __PACKAGE__->register_method({ PVE::QemuConfig->write_config($vmid, $conf); - my $do_trim = PVE::QemuServer::get_qga_key($conf, 'fstrim_cloned_disks'); + my $do_trim = PVE::QemuServer::Agent::get_qga_key($conf, 'fstrim_cloned_disks'); if ($running && $do_trim && PVE::QemuServer::Agent::qga_check_running($vmid)) { eval { mon_cmd($vmid, "guest-fstrim") }; } diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index 91eb0076..bb469197 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -297,7 +297,7 @@ sub __snapshot_check_freeze_needed { return ( $running, $running - && PVE::QemuServer::get_qga_key($config, 'enabled') + && PVE::QemuServer::Agent::get_qga_key($config, 'enabled') && PVE::QemuServer::Agent::qga_check_running($vmid), ); } else { diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm index 3f6f12be..82af9fc1 100644 --- a/src/PVE/QemuMigrate.pm +++ b/src/PVE/QemuMigrate.pm @@ -27,6 +27,7 @@ use PVE::Tunnel; use PVE::QemuConfig; use PVE::QemuMigrate::Helpers; +use PVE::QemuServer::Agent; use PVE::QemuServer::BlockJob; use PVE::QemuServer::CPUConfig; use PVE::QemuServer::Drive qw(checked_volume_format); @@ -1719,7 +1720,7 @@ sub phase3_cleanup { if ( $self->{storage_migration} - && PVE::QemuServer::get_qga_key($conf, 'fstrim_cloned_disks') + && PVE::QemuServer::Agent::get_qga_key($conf, 'fstrim_cloned_disks') && $self->{running} ) { if (!$self->{vm_was_paused}) { diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index bf229610..cb93bf45 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -53,7 +53,7 @@ use PVE::QMPClient; use PVE::QemuConfig; use PVE::QemuConfig::NoWrite; use PVE::QemuMigrate::Helpers; -use PVE::QemuServer::Agent qw(qga_check_running); +use PVE::QemuServer::Agent qw(get_qga_key parse_guest_agent qga_check_running); use PVE::QemuServer::Blockdev; use PVE::QemuServer::BlockJob; use PVE::QemuServer::Helpers @@ -147,35 +147,6 @@ my $watchdog_fmt = { }; PVE::JSONSchema::register_format('pve-qm-watchdog', $watchdog_fmt); -my $agent_fmt = { - enabled => { - description => - "Enable/disable communication with a QEMU Guest Agent (QGA) running in the VM.", - type => 'boolean', - default => 0, - default_key => 1, - }, - fstrim_cloned_disks => { - description => "Run fstrim after moving a disk or migrating the VM.", - type => 'boolean', - optional => 1, - default => 0, - }, - 'freeze-fs-on-backup' => { - description => "Freeze/thaw guest filesystems on backup for consistency.", - type => 'boolean', - optional => 1, - default => 1, - }, - type => { - description => "Select the agent type", - type => 'string', - default => 'virtio', - optional => 1, - enum => [qw(virtio isa)], - }, -}; - my $vga_fmt = { type => { description => "Select the VGA type. Using type 'cirrus' is not recommended.", @@ -471,7 +442,7 @@ EODESC description => "Enable/disable communication with the QEMU Guest Agent and its properties.", type => 'string', - format => $agent_fmt, + format => $PVE::QemuServer::Agent::agent_fmt, }, kvm => { optional => 1, @@ -1791,27 +1762,6 @@ sub parse_watchdog { return $res; } -sub parse_guest_agent { - my ($conf) = @_; - - return {} if !defined($conf->{agent}); - - my $res = eval { parse_property_string($agent_fmt, $conf->{agent}) }; - warn $@ if $@; - - # if the agent is disabled ignore the other potentially set properties - return {} if !$res->{enabled}; - return $res; -} - -sub get_qga_key { - my ($conf, $key) = @_; - return undef if !defined($conf->{agent}); - - my $agent = parse_guest_agent($conf); - return $agent->{$key}; -} - sub parse_vga { my ($value) = @_; diff --git a/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm index 9ec9c1de..5d88b7bd 100644 --- a/src/PVE/QemuServer/Agent.pm +++ b/src/PVE/QemuServer/Agent.pm @@ -6,6 +6,8 @@ use warnings; use JSON; use MIME::Base64 qw(decode_base64 encode_base64); +use PVE::JSONSchema; + use PVE::QemuServer::Helpers; use PVE::QemuServer::Monitor; @@ -14,9 +16,61 @@ use base 'Exporter'; our @EXPORT_OK = qw( check_agent_error agent_cmd + get_qga_key + parse_guest_agent qga_check_running ); +our $agent_fmt = { + enabled => { + description => + "Enable/disable communication with a QEMU Guest Agent (QGA) running in the VM.", + type => 'boolean', + default => 0, + default_key => 1, + }, + fstrim_cloned_disks => { + description => "Run fstrim after moving a disk or migrating the VM.", + type => 'boolean', + optional => 1, + default => 0, + }, + 'freeze-fs-on-backup' => { + description => "Freeze/thaw guest filesystems on backup for consistency.", + type => 'boolean', + optional => 1, + default => 1, + }, + type => { + description => "Select the agent type", + type => 'string', + default => 'virtio', + optional => 1, + enum => [qw(virtio isa)], + }, +}; + +sub parse_guest_agent { + my ($conf) = @_; + + return {} if !defined($conf->{agent}); + + my $res = eval { PVE::JSONSchema::parse_property_string($agent_fmt, $conf->{agent}) }; + warn $@ if $@; + + # if the agent is disabled ignore the other potentially set properties + return {} if !$res->{enabled}; + return $res; +} + +sub get_qga_key { + my ($conf, $key) = @_; + return undef if !defined($conf->{agent}); + + my $agent = parse_guest_agent($conf); + return $agent->{$key}; +} + sub qga_check_running { my ($vmid, $nowarn) = @_; diff --git a/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm index 23ac74f7..1addfa24 100644 --- a/src/PVE/VZDump/QemuServer.pm +++ b/src/PVE/VZDump/QemuServer.pm @@ -1096,7 +1096,8 @@ sub qga_fs_freeze { return; } - my $freeze = PVE::QemuServer::get_qga_key($self->{vmlist}->{$vmid}, 'freeze-fs-on-backup') // 1; + my $freeze = + PVE::QemuServer::Agent::get_qga_key($self->{vmlist}->{$vmid}, 'freeze-fs-on-backup') // 1; if (!$freeze) { $self->loginfo("skipping guest-agent 'fs-freeze', disabled in VM options"); return; -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel