[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v6 5/8] bootdevice: Gather LCHS from all relevan
From: |
John Snow |
Subject: |
Re: [Qemu-block] [PATCH v6 5/8] bootdevice: Gather LCHS from all relevant devices |
Date: |
Mon, 23 Sep 2019 17:40:27 -0400 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 |
On 8/27/19 4:24 AM, Sam Eiderman via Qemu-block wrote:
> From: Sam Eiderman <address@hidden>
>
> 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.
>
> Signed-off-by: Sam Eiderman <address@hidden>
> Reviewed-by: Karl Heubaum <address@hidden>
> Reviewed-by: Arbel Moshe <address@hidden>
> Signed-off-by: Sam Eiderman <address@hidden>
Acked-by: John Snow <address@hidden>
> ---
> 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 18851601cb..6d8ff34a16 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
> @@ -1186,6 +1186,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)
> @@ -1193,6 +1198,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 915641a0f1..d19896fe4d 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"
>
> @@ -2402,6 +2403,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)
> @@ -3006,6 +3017,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";
>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-block] [PATCH v6 5/8] bootdevice: Gather LCHS from all relevant devices,
John Snow <=