[pve-devel] [RFC PATCH qemu-server] fix bootdisk_size for new bootorder config scheme

[pve-devel] [RFC PATCH qemu-server] fix bootdisk_size for new bootorder config scheme

[Dominik Csapak]

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

Re: [pve-devel] [RFC PATCH qemu-server] fix bootdisk_size for new bootorder config scheme

[Thomas Lamprecht]

On 08.03.21 14:43, Dominik Csapak wrote:
> 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/
> 

@Stefan, can you, as main author behind the change in question, please give
this a review - thanks!

Re: [pve-devel] [RFC PATCH qemu-server] fix bootdisk_size for new bootorder config scheme

[Stefan Reiter]

On 3/8/21 2:43 PM, Dominik Csapak wrote:
> 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/
> 

Not intentional, I'm pretty sure I just went with the easy way out back 
then ;)

Reviewed-by: Stefan Reiter <s.reiter@proxmox.com>

[pve-devel] applied: [RFC PATCH qemu-server] fix bootdisk_size for new bootorder config scheme

[Thomas Lamprecht]

On 08.03.21 14:43, Dominik Csapak wrote:
> 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(-)
> 
>

applied, thanks!