diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-23 11:52:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-23 11:52:32 -0500 |
| commit | f3ca508f00fa1cc295334fe8f8010cd6ea45bacd (patch) | |
| tree | 2108abfeac83f3111c7fe59d7e1d99e8ee8a0896 /block/iscsi.c | |
| parent | 2571f8f5fbaea5dc3bdcd84737f109b459576e90 (diff) | |
| parent | f35c934a5add17eb549e3f7f4b8286605eb21e99 (diff) | |
| download | qemu-f3ca508f00fa1cc295334fe8f8010cd6ea45bacd.tar.gz | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
# By Hervé Poussineau (5) and Stefan Weil (1)
# Via Paolo Bonzini
* bonzini/scsi-next:
block/iscsi: Drop iscsi_co_get_block_status for older versions of libiscsi
lsi: add 53C810 variant
lsi: remove todo
lsi: ignore write accesses to CTEST0 registers
lsi: check ssid versus sdid only if ssid is valid
lsi: use constant name instead of its value
Diffstat (limited to 'block/iscsi.c')
| -rw-r--r-- | block/iscsi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index b6b47c649c..4460382811 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -811,6 +811,8 @@ iscsi_getlength(BlockDriverState *bs) return len; } +#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED) + static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum) @@ -901,6 +903,8 @@ out: return ret; } +#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */ + static int coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) @@ -1524,7 +1528,9 @@ static BlockDriver bdrv_iscsi = { .bdrv_getlength = iscsi_getlength, .bdrv_truncate = iscsi_truncate, +#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED) .bdrv_co_get_block_status = iscsi_co_get_block_status, +#endif .bdrv_co_discard = iscsi_co_discard, .bdrv_aio_readv = iscsi_aio_readv, |