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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E336C98AA4 for ; Mon, 9 Oct 2023 15:25:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C54E618A82 for ; Mon, 9 Oct 2023 15:25:26 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 9 Oct 2023 15:25:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6BE0244952 for ; Mon, 9 Oct 2023 15:25:24 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 9 Oct 2023 15:25:19 +0200 Message-Id: <20231009132519.115727-1-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.062 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 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 v3 qemu-server] Fix ACPI-suspended VMs resuming after migration 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: Mon, 09 Oct 2023 13:25:26 -0000 Add checks for "suspended" and "prelaunch" runstates when checking whether a VM is paused. This fixes the following issues: * ACPI-suspended VMs automatically resuming after migration * Shutdown and reboot commands timing out instead of failing immediately on suspended VMs Signed-off-by: Filip Schauer --- Changes since v2: * Make && and || operators consistent * Revert rename vm_is_paused to vm_is_frozen We could have renamed vm_is_paused to vcpus_are_paused, but I do not consider that necessary. PVE/QemuServer.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 1b1ccf4..2895675 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -8503,7 +8503,11 @@ sub vm_is_paused { mon_cmd($vmid, "query-status"); }; warn "$@\n" if $@; - return $qmpstatus && $qmpstatus->{status} eq "paused"; + return $qmpstatus && ( + $qmpstatus->{status} eq "paused" || + $qmpstatus->{status} eq "suspended" || + $qmpstatus->{status} eq "prelaunch" + ); } sub check_volume_storage_type { -- 2.39.2