From 21cacf5c920df891a69d3c2fc89ea6b62db64ba8 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 13 Feb 2025 14:17:00 +0100 Subject: [PATCH] vm stop-cleanup: allow callers to decide error behavior and keep it the same for all current callers as before by setting the additional 'noerr' parameter to '1'. Signed-off-by: Dominik Csapak --- 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 4214a7ca..3e3a4c91 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -963,7 +963,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 b6fc1f17..ffd5d56b 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6123,7 +6123,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 { @@ -6149,7 +6149,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 @@ -6200,7 +6203,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 { @@ -6231,7 +6234,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. @@ -6246,7 +6249,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; }