From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <root@dev.dominic.proxmox.com>
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 4E87A607CA
 for <pve-devel@lists.proxmox.com>; Thu, 26 Nov 2020 12:13:57 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 3C542EADB
 for <pve-devel@lists.proxmox.com>; Thu, 26 Nov 2020 12:13:27 +0100 (CET)
Received: from dev.dominic.proxmox.com (212-186-127-178.static.upcbusiness.at
 [212.186.127.178])
 by firstgate.proxmox.com (Proxmox) with ESMTP id CAAAFEAD1
 for <pve-devel@lists.proxmox.com>; Thu, 26 Nov 2020 12:13:26 +0100 (CET)
Received: by dev.dominic.proxmox.com (Postfix, from userid 0)
 id 9EBEB22644; Thu, 26 Nov 2020 12:13:26 +0100 (CET)
From: =?UTF-8?q?Dominic=20J=C3=A4ger?= <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 26 Nov 2020 12:13:10 +0100
Message-Id: <20201126111310.432518-1-d.jaeger@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:  1
 AWL -0.352 Adjusted score from AWL reputation of From: address
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
 methods
 KHOP_HELO_FCRDNS          0.4 Relay HELO differs from its IP's reverse DNS
 NO_DNS_FOR_FROM         0.379 Envelope sender has no MX or A DNS records
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_NONE                0.001 SPF: sender does not publish an 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. [drive.pm]
Subject: [pve-devel] [PATCH qemu-server] boot order: Do not use efidisk as
 default
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 26 Nov 2020 11:13:57 -0000

This allows to specify an efidisk during create without specifying
boot order.  This enables creating a VM, importing a disk and
afterwards deciding where to attach it:

qm create 102 --bios ovmf --efidisk0 local:0
qm importdisk 102 /root/Windows10.vmdk local
qm set 102 --sata0 local:102/vm-102-disk-1.raw --boot order=sata0

Reported-by: Dominic Jäger <d.jaeger@proxmox.com>
Authored-by: Stefan Reiter <s.reiter@proxmox.com>
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
 PVE/QemuServer/Drive.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm
index d560937..bb3e990 100644
--- a/PVE/QemuServer/Drive.pm
+++ b/PVE/QemuServer/Drive.pm
@@ -605,6 +605,7 @@ sub resolve_first_disk {
     my @disks = valid_drive_names();
     foreach my $ds (@disks) {
 	next if !$conf->{$ds};
+	next if $ds =~m/^efidisk/;
 	my $disk = parse_drive($ds, $conf->{$ds});
 	next if drive_is_cdrom($disk) xor $cdrom;
 	return $ds;
-- 
2.20.1