diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2014-01-24 15:50:14 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2014-01-24 15:50:14 -0800 |
| commit | e9f526ab7b01662c323a47446e22308968221ac1 (patch) | |
| tree | 58f91d4bfe27f82108db0e15bd41661f7a2282b1 /block | |
| parent | 0d688cf7d8d71bce2aab83173552a784e96b6729 (diff) | |
| parent | 1cb27d9233d572826b45bd8498d2fab1b6f01df9 (diff) | |
| download | qemu-e9f526ab7b01662c323a47446e22308968221ac1.tar.gz | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next:
scsi: Support TEST UNIT READY in the dummy LUN0
block: add .bdrv_reopen_prepare() stub for iscsi
virtio-scsi: Prevent assertion on missed events
virtio-scsi: Cleanup of I/Os that never started
scsi: Assign cancel_io vector for scsi_disk_emulate_ops
Conflicts:
block/iscsi.c
aliguori: resolve trivial merge conflict in block/iscsi.c
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/iscsi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 890bd81336..6f4af72a75 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1334,7 +1334,14 @@ static int iscsi_refresh_limits(BlockDriverState *bs) bs->bl.opt_transfer_length = sector_lun2qemu(iscsilun->bl.opt_xfer_len, iscsilun); } + return 0; +} +/* We have nothing to do for iSCSI reopen, stub just returns + * success */ +static int iscsi_reopen_prepare(BDRVReopenState *state, + BlockReopenQueue *queue, Error **errp) +{ return 0; } @@ -1446,6 +1453,7 @@ static BlockDriver bdrv_iscsi = { .bdrv_close = iscsi_close, .bdrv_create = iscsi_create, .create_options = iscsi_create_options, + .bdrv_reopen_prepare = iscsi_reopen_prepare, .bdrv_getlength = iscsi_getlength, .bdrv_get_info = iscsi_get_info, |