[SeaBIOS] Re: [PATCH v8 5/8] bootdevice: Gather LCHS from all relevant devices

[Philippe Mathieu-Daudé]

On 10/16/19 6:41 PM, Sam Eiderman wrote:
> From: Sam Eiderman
>
> Relevant devices are:
>      * ide-hd (and ide-cd, ide-drive)
>      * scsi-hd (and scsi-cd, scsi-disk, scsi-block)
>      * virtio-blk-pci
>
> We do not call del_boot_device_lchs() for ide-* since we don't need to -
> IDE block devices do not support unplugging.
>
> Reviewed-by: Karl Heubaum 
> Reviewed-by: Arbel Moshe 
> Signed-off-by: Sam Eiderman 
> Signed-off-by: Sam Eiderman
>
> hw/block/virtio-blk.c |  6 ++++++
>   hw/ide/qdev.c         |  5 +++++
>   hw/scsi/scsi-disk.c   | 12 ++++++++++++
>   3 files changed, 23 insertions(+)
>
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index ed2ddebd2b..c56e905f80 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
> @@ -1200,6 +1200,11 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
>       blk_set_guest_block_size(s->blk, s->conf.conf.logical_block_size);
>   blk_iostatus_enable(s->blk);
>
> add_boot_device_lchs(dev, "/disk@0,0",
>                     conf->conf.lcyls,
>                     conf->conf.lheads,
>                     conf->conf.lsecs);
>
> }
>
> static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
>
> @@ -1207,6 +1212,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
>       VirtIODevice *vdev = VIRTIO_DEVICE(dev);
>       VirtIOBlock *s = VIRTIO_BLK(dev);
> del_boot_device_lchs(dev, "/disk@0,0");
>  virtio_blk_data_plane_destroy(s->dataplane);
>  s->dataplane = NULL;
>  qemu_del_vm_change_state_handler(s->change);
>
> diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
> index 6dd219944f..2ffd387a73 100644
> --- a/hw/ide/qdev.c
> +++ b/hw/ide/qdev.c
> @@ -220,6 +220,11 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)
>   add_boot_device_path(dev->conf.bootindex, &dev->qdev,
>                        dev->unit ? "/disk@1" : "/disk@0");
>
> add_boot_device_lchs(&dev->qdev, dev->unit ? "/disk@1" : "/disk@0",
>                     dev->conf.lcyls,
>                     dev->conf.lheads,
>                     dev->conf.lsecs);
>
> }
>
> static void ide_dev_get_bootindex(Object *obj, Visitor *v, const char *name,
>
> diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
> index 68b1675fd9..07fb5ebdf1 100644
> --- a/hw/scsi/scsi-disk.c
> +++ b/hw/scsi/scsi-disk.c
> @@ -35,6 +35,7 @@
>   #include "hw/block/block.h"
>   #include "hw/qdev-properties.h"
>   #include "sysemu/dma.h"
> +#include "sysemu/sysemu.h"
>   #include "qemu/cutils.h"
>   #include "trace.h"
>
> @@ -2414,6 +2415,16 @@ static void scsi_realize(SCSIDevice *dev, Error **errp)
>       blk_set_guest_block_size(s->qdev.conf.blk, s->qdev.blocksize);
>   blk_iostatus_enable(s->qdev.conf.blk);
> add_boot_device_lchs(&dev->qdev, NULL,
>                     dev->conf.lcyls,
>                     dev->conf.lheads,
>                     dev->conf.lsecs);
>
> +}
>
> +static void scsi_unrealize(SCSIDevice *dev, Error **errp)
> +{
>
> del_boot_device_lchs(&dev->qdev, NULL);
> }
>
> static void scsi_hd_realize(SCSIDevice *dev, Error **errp)
>
> @@ -3018,6 +3029,7 @@ static void scsi_hd_class_initfn(ObjectClass *klass, void *data)
>       SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(klass);
>   sc->realize      = scsi_hd_realize;
> sc->unrealize    = scsi_unrealize;
>  sc->alloc_req    = scsi_new_request;
>  sc->unit_attention_reported = scsi_disk_unit_attention_reported;
>  dc->desc = "virtual SCSI disk";

Reviewed-by: Philippe Mathieu-Daudé 
Tested-by: Philippe Mathieu-Daudé