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 0AA3F706BC for ; Fri, 22 Jul 2022 15:28:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 08F963E12 for ; Fri, 22 Jul 2022 15:28:00 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 22 Jul 2022 15:27:58 +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 2F35043B00 for ; Fri, 22 Jul 2022 15:27:58 +0200 (CEST) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Fri, 22 Jul 2022 15:27:38 +0200 Message-Id: <20220722132738.397449-5-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220722132738.397449-1-d.tschlatscher@proxmox.com> References: <20220722132738.397449-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.103 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pve-devel] [PATCH qemu-server v2 1/1] make the timeout value editable when the VM is locked 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: Fri, 22 Jul 2022 13:28:00 -0000 In some cases the VM could no longer start when the timeout value was set and afterwards, for example, hibernated. In this case the VM is arguably soft locked, because the API would not allow changing the timeout value anymore. (The only way out here would be to change the value manually in the config) To avoid unwanted side effects, it is possible to change the value for the new 'startoptions' parameter, only if the VM is currently locked with lock 'suspended'. Signed-off-by: Daniel Tschlatscher --- Changes from v1: * New patch PVE/API2/Qemu.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 7449b9f..30b7f60 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -8,6 +8,7 @@ use POSIX; use IO::Socket::IP; use URI::Escape; use Crypt::OpenSSL::Random; +use List::Util qw(first); use PVE::Cluster qw (cfs_read_file cfs_write_file);; use PVE::RRD; @@ -626,6 +627,28 @@ my $check_vm_modify_config_perm = sub { return 1; }; +# Certain parameter fields should still be editable and deletable when the VM is locked +# Returns true only if all parameter fields to be edited or deleted are defined in @allowed +sub skiplock_for_allowed_fields { + my ($param, @deleted) = @_; + + my @allowed = qw"startoptions"; + my $skiplock = 1; + + my @to_check = @deleted; + for (keys %$param) { + push(@to_check, $_); + } + + my $idx = 0; + while ($skiplock && $idx < keys @to_check) { + $skiplock &= defined(first { $_ eq $to_check[$idx] } @allowed); + $idx++; + } + + return $skiplock; +} + __PACKAGE__->register_method({ name => 'vmlist', path => '', @@ -1456,6 +1479,8 @@ my $update_vm_api = sub { push @delete, 'runningcpu' if $conf->{runningcpu}; } + $skiplock |= $conf->{lock} eq "suspended" && skiplock_for_allowed_fields($param, @delete); + PVE::QemuConfig->check_lock($conf) if !$skiplock; foreach my $opt (keys %$revert) { -- 2.30.2