mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-04 17:23:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

block/iscsi: change all iscsilun properties from uint8_t to bool

Browse Source 
Signed-off-by: Peter Lieven <pl@kamp.de>
Message-id: 1429193313-4263-3-git-send-email-pl@kamp.de
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Peter Lieven 2015-04-16 16:08:26 +02:00 committed by Kevin Wolf
parent 20474e9aa0
commit 0a386e4852
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/iscsi.c
View File

@ -57,9 +57,6 @@ typedef struct IscsiLun {
int events; int events;
QEMUTimer *nop_timer; QEMUTimer *nop_timer;
QEMUTimer *event_timer; QEMUTimer *event_timer;
uint8_t lbpme;
uint8_t lbprz;
uint8_t has_write_same;
struct scsi_inquiry_logical_block_provisioning lbp; struct scsi_inquiry_logical_block_provisioning lbp;
struct scsi_inquiry_block_limits bl; struct scsi_inquiry_block_limits bl;
unsigned char *zeroblock; unsigned char *zeroblock;
@ -67,6 +64,9 @@ typedef struct IscsiLun {
int cluster_sectors; int cluster_sectors;
bool use_16_for_rw; bool use_16_for_rw;
bool write_protected; bool write_protected;
bool lbpme;
bool lbprz;
bool has_write_same;
} IscsiLun; } IscsiLun;
typedef struct IscsiTask { typedef struct IscsiTask {
@ -460,7 +460,7 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,
*pnum = nb_sectors; *pnum = nb_sectors;
/* LUN does not support logical block provisioning */ /* LUN does not support logical block provisioning */
if (iscsilun->lbpme == 0) { if (!iscsilun->lbpme) {
goto out; goto out;
} }
@ -1121,8 +1121,8 @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp)
} else { } else {
iscsilun->block_size = rc16->block_length; iscsilun->block_size = rc16->block_length;
iscsilun->num_blocks = rc16->returned_lba + 1; iscsilun->num_blocks = rc16->returned_lba + 1;
iscsilun->lbpme = rc16->lbpme; iscsilun->lbpme = !!rc16->lbpme;
iscsilun->lbprz = rc16->lbprz; iscsilun->lbprz = !!rc16->lbprz;
iscsilun->use_16_for_rw = (rc16->returned_lba > 0xffffffff); iscsilun->use_16_for_rw = (rc16->returned_lba > 0xffffffff);
} }
} }
@ -1655,7 +1655,7 @@ out:
static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
{ {
IscsiLun *iscsilun = bs->opaque; IscsiLun *iscsilun = bs->opaque;
bdi->unallocated_blocks_are_zero = !!iscsilun->lbprz; bdi->unallocated_blocks_are_zero = iscsilun->lbprz;
bdi->can_write_zeroes_with_unmap = iscsilun->lbprz && iscsilun->lbp.lbpws; bdi->can_write_zeroes_with_unmap = iscsilun->lbprz && iscsilun->lbp.lbpws;
bdi->cluster_size = iscsilun->cluster_sectors * BDRV_SECTOR_SIZE; bdi->cluster_size = iscsilun->cluster_sectors * BDRV_SECTOR_SIZE;
return 0; return 0;