[pve-devel] [PATCH qemu-server v6 01/10] vm stop-cleanup: allow callers to decide error behavior

[Dominik Csapak]

and keep it the same for all current callers as before by setting the
additional 'noerr' parameter to '1'.

Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
reordered in v6, was 4/11 in v5, no changes otherwise
 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 808c0e1c..fc27d0e6 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6109,7 +6109,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 {
 
@@ -6135,7 +6135,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
@@ -6186,7 +6189,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 {
@@ -6217,7 +6220,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.
@@ -6232,7 +6235,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.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel