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 3A6801FF396 for ; Thu, 6 Jun 2024 11:23:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B89F1B222; Thu, 6 Jun 2024 11:23:02 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Jun 2024 11:22:06 +0200 Message-Id: <20240606092220.1190913-12-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606092220.1190913-1-d.csapak@proxmox.com> References: <20240606092220.1190913-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH qemu-server v4 05/12] vm_stop_cleanup: add noerr parameter 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" and set it on all current users Signed-off-by: Dominik Csapak --- no changes PVE/CLI/qm.pm | 2 +- PVE/QemuServer.pm | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index b105830f..fbc590f5 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -933,7 +933,7 @@ __PACKAGE__->register_method({ if (!$clean || $guest) { # vm was shutdown from inside the guest or crashed, doing api cleanup - PVE::QemuServer::vm_stop_cleanup($storecfg, $vmid, $conf, 0, 0); + PVE::QemuServer::vm_stop_cleanup($storecfg, $vmid, $conf, 0, 0, 1); } PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'post-stop'); diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index bbad02f4..2d583ddf 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6168,7 +6168,7 @@ sub cleanup_pci_devices { } sub vm_stop_cleanup { - my ($storecfg, $vmid, $conf, $keepActive, $apply_pending_changes) = @_; + my ($storecfg, $vmid, $conf, $keepActive, $apply_pending_changes, $noerr) = @_; eval { @@ -6194,7 +6194,10 @@ sub vm_stop_cleanup { vmconfig_apply_pending($vmid, $conf, $storecfg) if $apply_pending_changes; }; - warn $@ if $@; # avoid errors - just warn + if (my $err = $@) { + die $err if !$noerr; + warn $err; + } } # call only in locked context @@ -6245,7 +6248,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, 1, 1) if $conf; return; } } else { @@ -6276,7 +6279,7 @@ sub _do_vm_stop { sleep 1; } - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1) if $conf; + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1, 1) if $conf; } # Note: use $nocheck to skip tests if VM configuration file exists. @@ -6291,7 +6294,7 @@ sub vm_stop { my $pid = check_running($vmid, $nocheck, $migratedfrom); kill 15, $pid if $pid; my $conf = PVE::QemuConfig->load_config($vmid, $migratedfrom); - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 0); + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 0, 1); return; } -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel