From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7Lhx-0006Zb-Aw for qemu-devel@nongnu.org; Tue, 23 Jun 2015 06:45:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7Lhw-00066W-D1 for qemu-devel@nongnu.org; Tue, 23 Jun 2015 06:45:37 -0400 From: Dimitris Aragiorgis Date: Tue, 23 Jun 2015 13:44:56 +0300 Message-Id: <1435056300-14924-2-git-send-email-dimara@arrikto.com> In-Reply-To: <1435056300-14924-1-git-send-email-dimara@arrikto.com> References: <1435056300-14924-1-git-send-email-dimara@arrikto.com> Subject: [Qemu-devel] [PATCH v5 1/5] block: Use bdrv_is_sg() everywhere List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-block@nongnu.org, stefanha@redhat.com Instead of checking bs->sg use bdrv_is_sg() consistently throughout the code. Signed-off-by: Dimitris Aragiorgis Reviewed-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi --- block.c | 6 +++--- block/iscsi.c | 2 +- block/raw-posix.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index dd4f58d..f04b2a1 100644 --- a/block.c +++ b/block.c @@ -583,7 +583,7 @@ static int find_image_format(BlockDriverState *bs, const char *filename, int ret = 0; /* Return the raw BlockDriver * to scsi-generic devices or empty drives */ - if (bs->sg || !bdrv_is_inserted(bs) || bdrv_getlength(bs) == 0) { + if (bdrv_is_sg(bs) || !bdrv_is_inserted(bs) || bdrv_getlength(bs) == 0) { *pdrv = &bdrv_raw; return ret; } @@ -615,7 +615,7 @@ static int refresh_total_sectors(BlockDriverState *bs, int64_t hint) BlockDriver *drv = bs->drv; /* Do not attempt drv->bdrv_getlength() on scsi-generic devices */ - if (bs->sg) + if (bdrv_is_sg(bs)) return 0; /* query actual device if possible, otherwise just trust the hint */ @@ -946,7 +946,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, assert(bdrv_opt_mem_align(bs) != 0); assert(bdrv_min_mem_align(bs) != 0); - assert((bs->request_alignment != 0) || bs->sg); + assert((bs->request_alignment != 0) || bdrv_is_sg(bs)); qemu_opts_del(opts); return 0; diff --git a/block/iscsi.c b/block/iscsi.c index 14e97a6..000528c 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -627,7 +627,7 @@ static int coroutine_fn iscsi_co_flush(BlockDriverState *bs) IscsiLun *iscsilun = bs->opaque; struct IscsiTask iTask; - if (bs->sg) { + if (bdrv_is_sg(bs)) { return 0; } diff --git a/block/raw-posix.c b/block/raw-posix.c index 44ade8c..3ee3bd6 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -303,9 +303,9 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) char *buf; size_t max_align = MAX(MAX_BLOCKSIZE, getpagesize()); - /* For /dev/sg devices the alignment is not really used. + /* For SCSI generic devices the alignment is not really used. With buffered I/O, we don't have any restrictions. */ - if (bs->sg || !s->needs_alignment) { + if (bdrv_is_sg(bs) || !s->needs_alignment) { bs->request_alignment = 1; s->buf_align = 1; return; -- 1.7.10.4