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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B6E3F61682 for ; Wed, 21 Oct 2020 11:01:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A98A6160CA for ; Wed, 21 Oct 2020 11:00:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 97DB1160BD for ; Wed, 21 Oct 2020 11:00:37 +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 5DFD045E86 for ; Wed, 21 Oct 2020 11:00:37 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Wed, 21 Oct 2020 11:00:25 +0200 Message-Id: <20201021090025.13321-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.034 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 qemu-server] bootorder: don't print empty 'order=' property 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: Wed, 21 Oct 2020 09:01:08 -0000 Specifying 'boot: order=' was intended to be used for an empty bootorder (i.e. no boot devices), but as it turns out our format parser doesn't like empty '-list' properties if they are nested in a subformat. Fixing this in JSONSchema sounds like a risky move, so instead just write 'boot: ' (without 'order=') to indicate an empty bootorder. The rest of the code handles it just fine, as this was valid before too. Incidentally also fixes a bug where you couldn't create a new VM without any disks if no explicit 'boot' property was specified (i.e. a simple 'qm create 100' without any parameters would fail). Reported-by: Dominic Jäger Signed-off-by: Stefan Reiter --- PVE/QemuServer.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 5cf7288..20e284c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -1148,6 +1148,7 @@ sub verify_bootdev { sub print_bootorder { my ($devs) = @_; + return "" if !@$devs; my $data = { order => join(';', @$devs) }; return PVE::JSONSchema::print_property_string($data, $boot_fmt); } -- 2.20.1