diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-22 15:27:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-22 15:27:46 +0100 |
| commit | 65903a8b0807dbe2983910060f5754d27762faed (patch) | |
| tree | 150f41181a390d3d14c48c68b6ded8b3389442a9 /block | |
| parent | ca8c0fab9504f000216308cafc833eb957fe9284 (diff) | |
| parent | 5a7733b0b728bb4900bdeed12fef22651ce0ab58 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
* remotes/bonzini/scsi-next:
megasas: remove buildtime strings
block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined
virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path
scsi: Document intentional fall through in scsi_req_length()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/iscsi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index d649424e5c..3892cc551e 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -381,6 +381,7 @@ retry: } +#if defined(LIBISCSI_FEATURE_IOVECTOR) static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun, int64_t sector_num, int nb_sectors) { @@ -393,9 +394,6 @@ static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun, sector_num / iscsilun->cluster_sectors) == size); } - -#if defined(LIBISCSI_FEATURE_IOVECTOR) - static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum) |