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 187099877C for ; Mon, 9 Oct 2023 13:11:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EA3DE1650B for ; Mon, 9 Oct 2023 13:11:10 +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 13:11:09 +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 BD023435FD for ; Mon, 9 Oct 2023 13:11:08 +0200 (CEST) Message-ID: <52e62cc8-325d-d43e-25e1-42b23f0009b4@proxmox.com> Date: Mon, 9 Oct 2023 13:11:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: Proxmox VE development discussion , Filip Schauer References: <20230825121851.103307-1-f.schauer@proxmox.com> <20230825121851.103307-2-f.schauer@proxmox.com> From: Fiona Ebner In-Reply-To: <20230825121851.103307-2-f.schauer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.828 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 NICE_REPLY_A -1.818 Looks like a legit reply (A) 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: Re: [pve-devel] [PATCH v2 qemu-server 1/2] Add missing checks for paused runstates 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 11:11:41 -0000 Am 25.08.23 um 14:18 schrieb Filip Schauer: > 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 > --- > PVE/QemuServer.pm | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index bf1de17..954fed7 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -8596,7 +8596,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" or > + $qmpstatus->{status} eq "suspended" or Style nit: mixing '&&' and 'or' is not too nice. For boolean expressions like here, '&&' and '||' should always be used. For assertions like $variable or die "error" usually 'or' is used in our code base. Once that's fixed: Reviewed-by: Fiona Ebner > + $qmpstatus->{status} eq "prelaunch" > + ); > } > > sub check_volume_storage_type {