From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0104D1FF144 for ; Tue, 24 Mar 2026 14:54:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDABC13572; Tue, 24 Mar 2026 14:54:05 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 4/8] agent: parse: change signature to take property string rather than full VM config Date: Tue, 24 Mar 2026 14:50:44 +0100 Message-ID: <20260324135325.120749-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260324135325.120749-1-f.ebner@proxmox.com> References: <20260324135325.120749-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: 1774360362319 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: LLNN2QBKR2WB73C6FWVG7DNYKNO3ZCNR X-Message-ID-Hash: LLNN2QBKR2WB73C6FWVG7DNYKNO3ZCNR 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 --- src/PVE/QemuServer.pm | 6 +++--- src/PVE/QemuServer/Agent.pm | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 545b653d..e94dae0d 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3421,7 +3421,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( @@ -5144,8 +5144,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 1e7b1895..974e282e 100644 --- a/src/PVE/QemuServer/Agent.pm +++ b/src/PVE/QemuServer/Agent.pm @@ -68,11 +68,11 @@ our $agent_fmt = { }; sub parse_guest_agent { - my ($conf) = @_; + my ($value) = @_; - return {} if !defined($conf->{agent}); + 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 @@ -84,7 +84,7 @@ sub get_qga_key { my ($conf, $key) = @_; return undef if !defined($conf->{agent}); - my $agent = parse_guest_agent($conf); + my $agent = parse_guest_agent($conf->{agent}); return $agent->{$key}; } -- 2.47.3