From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwx7h-0000Mv-68 for qemu-devel@nongnu.org; Fri, 05 Dec 2014 12:57:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xwx7M-0001GM-2E for qemu-devel@nongnu.org; Fri, 05 Dec 2014 12:56:57 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:46657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwx7L-0001G9-Q4 for qemu-devel@nongnu.org; Fri, 05 Dec 2014 12:56:35 -0500 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 5 Dec 2014 17:56:34 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3AB241B08051 for ; Fri, 5 Dec 2014 17:56:51 +0000 (GMT) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sB5HuWQM60817458 for ; Fri, 5 Dec 2014 17:56:32 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sB5HuV99004207 for ; Fri, 5 Dec 2014 10:56:32 -0700 From: Ekaterina Tumanova Date: Fri, 5 Dec 2014 18:56:18 +0100 Message-Id: <1417802181-20834-3-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <1417802181-20834-1-git-send-email-tumanova@linux.vnet.ibm.com> References: <1417802181-20834-1-git-send-email-tumanova@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 2/5] raw-posix: Factor block size detection out of raw_probe_alignment() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Public KVM Mailing List Cc: kwolf@redhat.com, dahi@linux.vnet.ibm.com, Ekaterina Tumanova , armbru@redhat.com, mihajlov@linux.vnet.ibm.com, borntraeger@de.ibm.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com Put it in new probe_logical_blocksize(). Signed-off-by: Ekaterina Tumanova --- block/raw-posix.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index b1af77e..633d5bc 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -217,11 +217,35 @@ static int raw_normalize_devicepath(const char **filename) } #endif +/* + * Set logical block size via ioctl. On success return 0. Otherwise -errno. + */ +static int probe_logical_blocksize(int fd, unsigned int *sector_size) +{ + /* Try a few ioctls to get the right size */ +#ifdef BLKSSZGET + if (ioctl(fd, BLKSSZGET, sector_size) < 0) { + return -errno; + } +#endif +#ifdef DKIOCGETBLOCKSIZE + if (ioctl(fd, DKIOCGETBLOCKSIZE, sector_size) < 0) { + return -errno; + } +#endif +#ifdef DIOCGSECTORSIZE + if (ioctl(fd, DIOCGSECTORSIZE, sector_size) < 0) { + return -errno; + } +#endif + + return 0; +} + static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) { BDRVRawState *s = bs->opaque; char *buf; - unsigned int sector_size; /* For /dev/sg devices the alignment is not really used. With buffered I/O, we don't have any restrictions. */ @@ -231,25 +255,11 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) return; } - /* Try a few ioctls to get the right size */ bs->request_alignment = 0; s->buf_align = 0; + /* Let's try to use the logical blocksize for the alignment. */ + probe_logical_blocksize(fd, &bs->request_alignment); -#ifdef BLKSSZGET - if (ioctl(fd, BLKSSZGET, §or_size) >= 0) { - bs->request_alignment = sector_size; - } -#endif -#ifdef DKIOCGETBLOCKSIZE - if (ioctl(fd, DKIOCGETBLOCKSIZE, §or_size) >= 0) { - bs->request_alignment = sector_size; - } -#endif -#ifdef DIOCGSECTORSIZE - if (ioctl(fd, DIOCGSECTORSIZE, §or_size) >= 0) { - bs->request_alignment = sector_size; - } -#endif #ifdef CONFIG_XFS if (s->is_xfs) { struct dioattr da; -- 1.8.5.5