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 CE5F4F6C8 for ; Fri, 16 Dec 2022 14:39:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AE928226B7 for ; Fri, 16 Dec 2022 14:39:06 +0100 (CET) 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 ; Fri, 16 Dec 2022 14:39:05 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A054643CE5 for ; Fri, 16 Dec 2022 14:39:05 +0100 (CET) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Fri, 16 Dec 2022 14:36:54 +0100 Message-Id: <20221216133655.510957-5-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216133655.510957-1-d.tschlatscher@proxmox.com> References: <20221216133655.510957-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.115 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemu.pm] Subject: [pve-devel] [PATCH qemu-server v3 4/5] 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, 16 Dec 2022 13:39:36 -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 soft locked in the GUI, 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 v2: * Rebased to current master PVE/API2/Qemu.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 8375ab9..a160440 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -11,6 +11,7 @@ use JSON; use URI::Escape; use Crypt::OpenSSL::Random; use Socket qw(SOCK_STREAM); +use List::Util qw(first); use PVE::APIClient::LWP; use PVE::CGroup; @@ -650,6 +651,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 => '', @@ -1598,6 +1621,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