From patchwork Fri May 8 17:47:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitris Aragiorgis X-Patchwork-Id: 470159 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0B4A1140281 for ; Sat, 9 May 2015 03:49:45 +1000 (AEST) Received: from localhost ([::1]:57129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqmP9-0008Eu-3m for incoming@patchwork.ozlabs.org; Fri, 08 May 2015 13:49:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqmNK-0004oR-9M for qemu-devel@nongnu.org; Fri, 08 May 2015 13:47:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqmNJ-00020c-BV for qemu-devel@nongnu.org; Fri, 08 May 2015 13:47:50 -0400 Received: from mx0.arrikto.com ([2a01:7e00::f03c:91ff:fe6e:d7ab]:42951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqmNG-0001sx-Nw; Fri, 08 May 2015 13:47:46 -0400 Received: from troi.arr-srv (mail.arr-srv [192.168.98.4]) by mx0.arrikto.com (Postfix) with ESMTP id 8C72FA07D; Fri, 8 May 2015 20:47:45 +0300 (EEST) Received: from lenovo.loc (unknown [192.168.94.120]) by troi.arr-srv (Postfix) with ESMTPSA id 38EFD312; Fri, 8 May 2015 20:47:45 +0300 (EEST) From: Dimitris Aragiorgis To: qemu-devel@nongnu.org Date: Fri, 8 May 2015 20:47:18 +0300 Message-Id: <1431107242-31947-2-git-send-email-dimara@arrikto.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431107242-31947-1-git-send-email-dimara@arrikto.com> References: <1431107242-31947-1-git-send-email-dimara@arrikto.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:7e00::f03c:91ff:fe6e:d7ab Cc: kwolf@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, qemu-block@nongnu.org Subject: [Qemu-devel] [PATCH v2 1/5] block: Use bdrv_is_sg() everywhere X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Instead of checking bs->sg use bdrv_is_sg() consistently throughout the code. Signed-off-by: Dimitris Aragiorgis Reviewed-by: Paolo Bonzini --- 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 7904098..d651b57 100644 --- a/block.c +++ b/block.c @@ -566,7 +566,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; } @@ -598,7 +598,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 */ @@ -890,7 +890,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, } assert(bdrv_opt_mem_align(bs) != 0); - assert((bs->request_alignment != 0) || bs->sg); + assert((bs->request_alignment != 0) || bdrv_is_sg(bs)); return 0; free_and_fail: diff --git a/block/iscsi.c b/block/iscsi.c index 8fca1d3..502a81f 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 24d8582..24b061f 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -302,9 +302,9 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) BDRVRawState *s = bs->opaque; char *buf; - /* For /dev/sg devices the alignment is not really used. + /* For SG 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;