[PATCH] virtio-scsi: fix boot prio detection by using correct lun

[Stefan Reiter]

Commits

d6bdb85eb0 virtio-scsi: skip initializing non-bootable devices
  f82e82a5ab2 virtio-mmio: add support for scsi devices.

both use the lun value from tmpl_drv, which is always 0, instead of the
correct one passed as a seperate parameter. This causes systems where
LUNs other than 0 are set as bootable, but 0 is not, to not boot.

Signed-off-by: Stefan Reiter 
---
 src/hw/virtio-scsi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c
index 59f1c65..369c981 100644
--- a/src/hw/virtio-scsi.c
+++ b/src/hw/virtio-scsi.c
@@ -126,14 +126,14 @@ virtio_scsi_add_lun(u32 lun, struct drive_s *tmpl_drv)
     int prio = -1;

if (tmpl_vlun->pci)
-        prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, tmpl_vlun->lun);
+        prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, lun);
     if (tmpl_vlun->mmio)
-        prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, tmpl_vlun->lun);
+        prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, lun);

if (skip_nonbootable && prio < 0) {
         dprintf(1, "skipping init of a non-bootable virtio-scsi dev at %s,"
                 " target %d, lun %d\n",
-                tmpl_vlun->name, tmpl_vlun->target, tmpl_vlun->lun);
+                tmpl_vlun->name, tmpl_vlun->target, lun);
         return -1;
     }

[Paul Menzel]

Dear Stefan,

Am 27.07.20 um 14:47 schrieb Stefan Reiter:
> Commits
>
> d6bdb85eb0 virtio-scsi: skip initializing non-bootable devices
>    f82e82a5ab2 virtio-mmio: add support for scsi devices.
>
> both use the lun value from tmpl_drv, which is always 0, instead of the
> correct one passed as a seperate parameter. This causes systems where

sep*a*rate
> LUNs other than 0 are set as bootable, but 0 is not, to not boot.
> Signed-off-by: Stefan Reiter
>
> src/hw/virtio-scsi.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c
> index 59f1c65..369c981 100644
> --- a/src/hw/virtio-scsi.c
> +++ b/src/hw/virtio-scsi.c
> @@ -126,14 +126,14 @@ virtio_scsi_add_lun(u32 lun, struct drive_s *tmpl_drv)
>       int prio = -1;
>   if (tmpl_vlun->pci)
>    prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, tmpl_vlun->lun);
>    prio = bootprio_find_scsi_device(tmpl_vlun->pci, tmpl_vlun->target, lun);
> if (tmpl_vlun->mmio)
>    prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, tmpl_vlun->lun);
>    prio = bootprio_find_scsi_mmio_device(tmpl_vlun->mmio, tmpl_vlun->target, lun);
>
> if (skip_nonbootable && prio < 0) {
>     dprintf(1, "skipping init of a non-bootable virtio-scsi dev at %s,"
>             " target %d, lun %d\n",
>            tmpl_vlun->name, tmpl_vlun->target, tmpl_vlun->lun);
>            tmpl_vlun->name, tmpl_vlun->target, lun);
>     return -1;
> }

Reviewed-by: Paul Menzel

Kind regards,

Paul