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 39C736B0E4 for ; Mon, 8 Mar 2021 14:43:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 279CC1EF4F for ; Mon, 8 Mar 2021 14:43:40 +0100 (CET) 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 5C3ED1EF47 for ; Mon, 8 Mar 2021 14:43:39 +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 2219B45840 for ; Mon, 8 Mar 2021 14:43:39 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 8 Mar 2021 14:43:38 +0100 Message-Id: <20210308134338.31391-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.195 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 Subject: [pve-devel] [RFC PATCH qemu-server] fix bootdisk_size for new bootorder config scheme 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, 08 Mar 2021 13:43:40 -0000 Previously, we ever only had a single boot *disk*, while possibly having multiple cdroms/nics in the boot order e.g. the config: boot: dnc bootdisk: scsi0 ide0: media=cdrom,none scsi0: xxx net0: ... would return the size of scsi0 even though it would first boot from cdrom/network. When editing the bootorder with such a legacy config, we remove the 'bootdisk' property and replace the legacy notation with an explicit order, but we only search the first disk for the size now. Restore that behaviour by iterating over all disks in the boot order property string until we get one that is not a cdrom and has a size. Signed-off-by: Dominik Csapak --- i cannot remember if that change was deliberate, but at least one user ran into that: https://forum.proxmox.com/threads/possible-bug-boot-disk-size-shows-as-0b.85454/ PVE/QemuServer/Drive.pm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index d560937..26528f9 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -522,20 +522,18 @@ sub bootdisk_size { my $bootdisks = get_bootdisks($conf); return if !@$bootdisks; - my $bootdisk = $bootdisks->[0]; - return if !is_valid_drivename($bootdisk); - - return if !$conf->{$bootdisk}; - - my $drive = parse_drive($bootdisk, $conf->{$bootdisk}); - return if !defined($drive); - - return if drive_is_cdrom($drive); - - my $volid = $drive->{file}; - return if !$volid; + for my $bootdisk (@$bootdisks) { + next if !is_valid_drivename($bootdisk); + next if !$conf->{$bootdisk}; + my $drive = parse_drive($bootdisk, $conf->{$bootdisk}); + next if !defined($drive); + next if drive_is_cdrom($drive); + my $volid = $drive->{file}; + next if !$volid; + return $drive->{size}; + } - return $drive->{size}; + return; } sub update_disksize { -- 2.20.1