From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2880482D59 for ; Wed, 1 Dec 2021 13:01:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B165BD83 for ; Wed, 1 Dec 2021 13:00:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9A121BD79 for ; Wed, 1 Dec 2021 13:00:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 69AC344C7D for ; Wed, 1 Dec 2021 13:00:40 +0100 (CET) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Wed, 1 Dec 2021 13:00:36 +0100 Message-Id: <20211201120036.427418-1-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.744 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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] Subject: [pve-devel] [PATCH qemu-server] apply pending changes at vm stop only if the section is not empty 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: , X-List-Received-Date: Wed, 01 Dec 2021 12:01:11 -0000 we also have the same skipping logic when starting vms. this way we avoid calling 'write_config' when there are no present changes to commit. Signed-off-by: Oguz Bektas --- PVE/QemuServer.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 45b704d..1379f33 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4998,6 +4998,8 @@ sub vmconfig_delete_or_detach_drive { sub vmconfig_apply_pending { my ($vmid, $conf, $storecfg, $errors) = @_; + return if !scalar(keys %{$conf->{pending}}); + my $add_apply_error = sub { my ($opt, $msg) = @_; my $err_msg = "unable to apply pending change $opt : $msg"; @@ -5889,7 +5891,7 @@ sub _do_vm_stop { die "VM quit/powerdown failed - got timeout\n"; } } else { - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1) if $conf; + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, scalar(keys %{$conf->{pending}})) if $conf; return; } } else { @@ -5920,7 +5922,7 @@ sub _do_vm_stop { sleep 1; } - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1) if $conf; + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, scalar(keys %{$conf->{pending}})) if $conf; } # Note: use $nocheck to skip tests if VM configuration file exists. -- 2.30.2