From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0q1d-0004Yv-Bf for qemu-devel@nongnu.org; Tue, 16 Dec 2014 06:10:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0q1O-0002Iu-NS for qemu-devel@nongnu.org; Tue, 16 Dec 2014 06:10:45 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:56513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0q1O-0002Ic-F3 for qemu-devel@nongnu.org; Tue, 16 Dec 2014 06:10:30 -0500 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 16 Dec 2014 11:10:29 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 431C62190061 for ; Tue, 16 Dec 2014 11:09:57 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sBGBAQBw8716288 for ; Tue, 16 Dec 2014 11:10:26 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sBGBAPFV027935 for ; Tue, 16 Dec 2014 04:10:26 -0700 From: Ekaterina Tumanova Date: Tue, 16 Dec 2014 12:10:16 +0100 Message-Id: <1418728219-40595-3-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <1418728219-40595-1-git-send-email-tumanova@linux.vnet.ibm.com> References: <1418728219-40595-1-git-send-email-tumanova@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 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, thuth@linux.vnet.ibm.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 | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index e51293a..38172ca 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -217,11 +217,31 @@ static int raw_normalize_devicepath(const char **filename) } #endif +/* + * Get logical block size via ioctl. On success return 0. Otherwise -errno. + */ +static int probe_logical_blocksize(int fd, unsigned int *sector_size) +{ +#if defined(BLKSSZGET) +# define SECTOR_SIZE BLKSSZGET +#elif defined(DKIOCGETBLOCKSIZE) +# define SECTOR_SIZE DKIOCGETBLOCKSIZE +#elif defined(DIOCGSECTORSIZE) +# define SECTOR_SIZE DIOCGSECTORSIZE +#else + return -ENOTSUP +#endif + if (ioctl(fd, SECTOR_SIZE, sector_size) < 0) { + return -errno; + } + return 0; +#undef SECTOR_SIZE +} + 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 +251,12 @@ 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; - -#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; + /* Let's try to use the logical blocksize for the alignment. */ + if (probe_logical_blocksize(fd, &bs->request_alignment) < 0) { + bs->request_alignment = 0; } -#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