From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [RFC PATCH qemu-server] fix bootdisk_size for new bootorder config scheme
Date: Mon, 8 Mar 2021 14:43:38 +0100 [thread overview]
Message-ID: <20210308134338.31391-1-d.csapak@proxmox.com> (raw)
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 <d.csapak@proxmox.com>
---
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
next reply other threads:[~2021-03-08 13:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 13:43 Dominik Csapak [this message]
2021-04-22 20:02 ` Thomas Lamprecht
2021-04-26 8:29 ` Stefan Reiter
2021-04-29 14:19 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308134338.31391-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox