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 923891FF13F for ; Thu, 23 Apr 2026 14:40:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B19F616A36; Thu, 23 Apr 2026 14:40:45 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 3/7] agent: parse: change signature to take property string rather than full VM config Date: Thu, 23 Apr 2026 14:35:14 +0200 Message-ID: <20260423124004.115303-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260423124004.115303-1-f.ebner@proxmox.com> References: <20260423124004.115303-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776947919073 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.008 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm,agent.pm] Message-ID-Hash: ENL2ZWUEBDUU3WS3RZRSGFKLGI4LQ5V6 X-Message-ID-Hash: ENL2ZWUEBDUU3WS3RZRSGFKLGI4LQ5V6 X-MailFrom: f.ebner@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: Better encapsulation and in preparation to harmonize checks for freeze while avoiding the need to pass the full config to block jobs. Signed-off-by: Fiona Ebner --- Changes in v2: * Also adapt new should_fs_freeze() caller. src/PVE/QemuServer.pm | 6 +++--- src/PVE/QemuServer/Agent.pm | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 2a469fff..ec311160 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3426,7 +3426,7 @@ sub config_to_command { push @$cmd, '-k', $conf->{keyboard} if defined($conf->{keyboard}); - my $guest_agent = parse_guest_agent($conf); + my $guest_agent = parse_guest_agent($conf->{agent}); if ($guest_agent->{enabled}) { my $qgasocket = PVE::QemuServer::Helpers::qmp_socket( @@ -5163,8 +5163,8 @@ sub vmconfig_update_agent { my $hotplug_options = { fstrim_cloned_disks => 1 }; - my $old_agent = parse_guest_agent($conf); - my $agent = parse_guest_agent({ $opt => $value }); + my $old_agent = parse_guest_agent($conf->{agent}); + my $agent = parse_guest_agent($value); for my $option (keys %$agent) { # added/changed options next if defined($hotplug_options->{$option}); diff --git a/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm index a68dd8d7..8b814edd 100644 --- a/src/PVE/QemuServer/Agent.pm +++ b/src/PVE/QemuServer/Agent.pm @@ -61,10 +61,10 @@ our $agent_fmt = { }, }; -sub parse_guest_agent($conf) { - return {} if !defined($conf->{agent}); +sub parse_guest_agent($value) { + return {} if !defined($value); - my $res = eval { PVE::JSONSchema::parse_property_string($agent_fmt, $conf->{agent}) }; + my $res = eval { PVE::JSONSchema::parse_property_string($agent_fmt, $value) }; warn $@ if $@; # if the agent is disabled ignore the other potentially set properties @@ -75,7 +75,7 @@ sub parse_guest_agent($conf) { sub get_qga_key($conf, $key) { return undef if !defined($conf->{agent}); - my $agent = parse_guest_agent($conf); + my $agent = parse_guest_agent($conf->{agent}); return $agent->{$key}; } @@ -188,7 +188,7 @@ Does B check whether the agent is actually running. =cut sub should_fs_freeze($conf) { - my $agent = parse_guest_agent($conf); + my $agent = parse_guest_agent($conf->{agent}); return 0 if !$agent->{enabled}; return $agent->{'freeze-fs'} // 1; } -- 2.47.3