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 E4C4A7FD75 for ; Mon, 15 Nov 2021 16:57:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D1BE1DCFF for ; Mon, 15 Nov 2021 16:56:42 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C11D4DCF4 for ; Mon, 15 Nov 2021 16:56:41 +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 997D040503 for ; Mon, 15 Nov 2021 16:56:41 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 15 Nov 2021 16:56:41 +0100 Message-Id: <20211115155641.3037432-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.216 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] exclude efidisk and tpmstate for boot disk selection 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, 15 Nov 2021 15:57:12 -0000 else we cannot create a vm without a disk but with a tpmstate/efidisk, since the api tries to generate the default bootorder with them included Signed-off-by: Dominik Csapak --- PVE/QemuServer/Drive.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index 0f9ceba..7b82fb2 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -457,6 +457,10 @@ for (my $i = 0; $i < $MAX_UNUSED_DISKS; $i++) { $drivedesc_hash->{"unused$i"} = $unuseddesc; } +sub valid_drive_names_for_boot { + return grep { $_ ne 'efidisk0' && $_ ne 'tpmstate0' } valid_drive_names(); +} + sub valid_drive_names { # order is important - used to autoselect boot disk return ((map { "ide$_" } (0 .. ($MAX_IDE_DISKS - 1))), @@ -697,7 +701,7 @@ sub is_volume_in_use { sub resolve_first_disk { my ($conf, $cdrom) = @_; - my @disks = valid_drive_names(); + my @disks = valid_drive_names_for_boot(); foreach my $ds (@disks) { next if !$conf->{$ds}; my $disk = parse_drive($ds, $conf->{$ds}); -- 2.30.2