[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 6/8] block: add eject request callback
From: |
Kevin Wolf |
Subject: |
Re: [Qemu-devel] [PATCH 6/8] block: add eject request callback |
Date: |
Fri, 28 Oct 2011 19:21:36 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 |
Am 25.10.2011 12:53, schrieb Paolo Bonzini:
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> block.c | 7 +++++++
> block.h | 7 +++++++
> blockdev.c | 8 +++++---
> 3 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/block.c b/block.c
> index 9873b57..53e21ba 100644
> --- a/block.c
> +++ b/block.c
> @@ -821,6 +821,13 @@ bool bdrv_dev_has_removable_media(BlockDriverState *bs)
> return !bs->dev || (bs->dev_ops && bs->dev_ops->change_media_cb);
> }
>
> +void bdrv_dev_eject_request(BlockDriverState *bs, bool force)
> +{
> + if (bs->dev_ops && bs->dev_ops->eject_request_cb) {
> + bs->dev_ops->eject_request_cb(bs->dev_opaque, force);
> + }
> +}
> +
> bool bdrv_dev_is_tray_open(BlockDriverState *bs)
> {
> if (bs->dev_ops && bs->dev_ops->is_tray_open) {
> diff --git a/block.h b/block.h
> index e77988e..d3c3d62 100644
> --- a/block.h
> +++ b/block.h
> @@ -39,6 +39,12 @@ typedef struct BlockDevOps {
> */
> void (*change_media_cb)(void *opaque, bool load);
> /*
> + * Runs when an eject request is issued from the monitor, the tray
> + * is closed, and the medium is locked.
> + * Device models with removable media must implement this callback.
> + */
> + void (*eject_request_cb)(void *opaque, bool force);
> + /*
> * Is the virtual tray open?
> * Device models implement this only when the device has a tray.
> */
> @@ -116,6 +122,7 @@ void bdrv_detach_dev(BlockDriverState *bs, void *dev);
> void *bdrv_get_attached_dev(BlockDriverState *bs);
> void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops,
> void *opaque);
> +void bdrv_dev_eject_request(BlockDriverState *bs, bool force);
> bool bdrv_dev_has_removable_media(BlockDriverState *bs);
> bool bdrv_dev_is_tray_open(BlockDriverState *bs);
> bool bdrv_dev_is_medium_locked(BlockDriverState *bs);
> diff --git a/blockdev.c b/blockdev.c
> index 0827bf7..4cf333a 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -635,9 +635,11 @@ static int eject_device(Monitor *mon, BlockDriverState
> *bs, int force)
> qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));
> return -1;
> }
> - if (!force && !bdrv_dev_is_tray_open(bs)
> - && bdrv_dev_is_medium_locked(bs)) {
> - qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));
> + if (bdrv_dev_is_medium_locked(bs) && !bdrv_dev_is_tray_open(bs)) {
> + bdrv_dev_eject_request(bs, force);
> + if (!force) {
> + qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));
> + }
> return -1;
> }
> bdrv_close(bs);
Now force doesn't force any more. It avoids the error message, but
doesn't forcefully close the BlockDriverState any more. Intentional? If
so, why is it a good idea?
Kevin
- [Qemu-devel] [PATCH 0/5] My remaining block/SCSI patches for 1.0, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 2/8] scsi-disk: bump SCSIRequest reference count until aio completion runs, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 3/8] scsi-generic: bump SCSIRequest reference count until aio completion runs, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 1/8] scsi: do not call transfer_data after canceling a request, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 4/8] scsi: push request restart to SCSIDevice, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 6/8] block: add eject request callback, Paolo Bonzini, 2011/10/25
- Re: [Qemu-devel] [PATCH 6/8] block: add eject request callback,
Kevin Wolf <=
- [Qemu-devel] [PATCH 5/8] scsi-disk: add scsi-block for device passthrough, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 8/8] scsi-disk: implement eject requests, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 7/8] atapi: implement eject requests, Paolo Bonzini, 2011/10/25
- [Qemu-devel] ping Re: [PATCH 0/5] My remaining block/SCSI patches for 1.0, Paolo Bonzini, 2011/10/27