From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v3 05/10] vm_stop_cleanup: add noerr parameter
Date: Fri, 19 Apr 2024 14:45:44 +0200 [thread overview]
Message-ID: <20240419124556.3334691-10-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240419124556.3334691-1-d.csapak@proxmox.com>
and set it on all current users
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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 680c36f2..5ab52e7a 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6165,7 +6165,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 {
@@ -6191,7 +6191,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
@@ -6242,7 +6245,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 {
@@ -6273,7 +6276,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.
@@ -6288,7 +6291,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
next prev parent reply other threads:[~2024-04-19 12:47 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 12:45 [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 1/4] mapping: pci: rework properties check Dominik Csapak
2024-05-31 11:37 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 2/4] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2024-05-31 12:02 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 3/4] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 4/4] mapping: remove find_on_current_node Dominik Csapak
2024-05-31 12:09 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 01/10] usb: mapping: move implementation of find_on_current_node here Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 02/10] pci: " Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 03/10] pci: mapping: check mdev config against hardware Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 04/10] stop cleanup: remove unnecessary tpmstate cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-04-19 12:45 ` Dominik Csapak [this message]
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 06/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-06-05 8:49 ` Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 07/10] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-06-05 8:51 ` Dominik Csapak
2024-06-05 9:31 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 08/10] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2024-05-31 13:05 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 09/10] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-05-31 13:13 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 10/10] api: include not mapped resources for running vms in migrate preconditions Dominik Csapak
2024-05-31 13:37 ` Fiona Ebner
2024-06-05 9:21 ` Dominik Csapak
2024-06-05 9:38 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 2/5] bulk migrate: improve precondition checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2024-05-28 7:25 ` [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-05-31 8:11 ` Eneko Lacunza via pve-devel
[not found] ` <954884c6-3a53-4b3a-bdc8-93478037b6a6@binovo.es>
2024-05-31 8:41 ` Dominik Csapak
2024-06-03 8:43 ` Eneko Lacunza via pve-devel
2024-05-31 11:14 ` Fiona Ebner
2024-06-05 8:01 ` Dominik Csapak
2024-05-31 13:40 ` Fiona Ebner
2024-06-06 9:38 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240419124556.3334691-10-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox