public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Filip Schauer <f.schauer@proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 qemu-server 1/2] Add missing checks for paused runstates
Date: Mon, 9 Oct 2023 13:11:08 +0200	[thread overview]
Message-ID: <52e62cc8-325d-d43e-25e1-42b23f0009b4@proxmox.com> (raw)
In-Reply-To: <20230825121851.103307-2-f.schauer@proxmox.com>

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 <f.schauer@proxmox.com>
> ---
>  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 <f.ebner@proxmox.com>

> +	$qmpstatus->{status} eq "prelaunch"
> +    );
>  }
>  
>  sub check_volume_storage_type {




  reply	other threads:[~2023-10-09 11:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-25 12:18 [pve-devel] [PATCH v2 qemu-server 0/2] Fix ACPI-suspended VMs resuming after migration Filip Schauer
2023-08-25 12:18 ` [pve-devel] [PATCH v2 qemu-server 1/2] Add missing checks for paused runstates Filip Schauer
2023-10-09 11:11   ` Fiona Ebner [this message]
2023-08-25 12:18 ` [pve-devel] [PATCH v2 qemu-server 2/2] Rename vm_is_paused to vm_is_frozen Filip Schauer
2023-10-09 11:11   ` Fiona Ebner
2023-10-09 13:27 ` [pve-devel] [PATCH v2 qemu-server 0/2] Fix ACPI-suspended VMs resuming after migration Filip Schauer

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=52e62cc8-325d-d43e-25e1-42b23f0009b4@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=f.schauer@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal