From: Max Reitz <mreitz@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: kwolf@redhat.com, Peter Maydell <peter.maydell@linaro.org>,
vsementsov@virtuozzo.com, qemu-block@nongnu.org,
Joelle van Dyne <j@getutm.app>, Warner Losh <imp@bsdimp.com>
Subject: Re: [PATCH v4 7/7] block: detect DKIOCGETBLOCKCOUNT/SIZE before use
Date: Wed, 23 Jun 2021 17:47:25 +0200 [thread overview]
Message-ID: <5be29121-b904-a990-4eda-707997004c43@redhat.com> (raw)
In-Reply-To: <20210608131634.423904-8-pbonzini@redhat.com>
On 08.06.21 15:16, Paolo Bonzini wrote:
> From: Joelle van Dyne <j@getutm.app>
>
> iOS hosts do not have these defined so we fallback to the
> default behaviour.
>
> Co-authored-by: Warner Losh <imp@bsdimp.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Joelle van Dyne <j@getutm.app>
> Message-Id: <20210315180341.31638-4-j@getutm.app>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> block/file-posix.c | 21 +++++++++------------
> 1 file changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/block/file-posix.c b/block/file-posix.c
> index 5821e1afed..4e2f7cf508 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -2322,8 +2322,11 @@ static int64_t raw_getlength(BlockDriverState *bs)
> again:
> #endif
> if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) {
> + size = 0;
> #ifdef DIOCGMEDIASIZE
> - if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
> + if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) {
> + size = 0;
> + }
> #elif defined(DIOCGPART)
> {
> struct partinfo pi;
> @@ -2332,9 +2335,7 @@ again:
> else
> size = 0;
> }
> - if (size == 0)
> -#endif
> -#if defined(__APPLE__) && defined(__MACH__)
> +#elif defined(DKIOCGETBLOCKCOUNT) && defined(DKIOCGETBLOCKSIZE)
In v3, I was wondering whether it’s intentional that the following
DKIOCGETBLOCKCOUNT/SIZE block would no longer be used as a fallback if
the DIOCGMEDIASIZE ioctl failed (which it was before this patch). I’m
still wondering.
Max
> {
> uint64_t sectors = 0;
> uint32_t sector_size = 0;
> @@ -2342,19 +2343,15 @@ again:
> if (ioctl(fd, DKIOCGETBLOCKCOUNT, §ors) == 0
> && ioctl(fd, DKIOCGETBLOCKSIZE, §or_size) == 0) {
> size = sectors * sector_size;
> - } else {
> - size = lseek(fd, 0LL, SEEK_END);
> - if (size < 0) {
> - return -errno;
> - }
> }
> }
> -#else
> - size = lseek(fd, 0LL, SEEK_END);
> +#endif
> + if (size == 0) {
> + size = lseek(fd, 0LL, SEEK_END);
> + }
> if (size < 0) {
> return -errno;
> }
> -#endif
> #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> switch(s->type) {
> case FTYPE_CD:
prev parent reply other threads:[~2021-06-23 15:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 13:16 [PATCH v4 0/7] block: file-posix queue Paolo Bonzini
2021-06-08 13:16 ` [PATCH v4 1/7] file-posix: fix max_iov for /dev/sg devices Paolo Bonzini
2021-06-08 17:34 ` Eric Blake
2021-06-08 19:14 ` Vladimir Sementsov-Ogievskiy
2021-06-09 16:08 ` Maxim Levitsky
2021-06-23 15:42 ` Max Reitz
2021-06-24 7:33 ` Vladimir Sementsov-Ogievskiy
2021-06-08 13:16 ` [PATCH v4 2/7] scsi-generic: pass max_segments via max_iov field in BlockLimits Paolo Bonzini
2021-06-08 17:42 ` Eric Blake
2021-06-09 16:10 ` Maxim Levitsky
2021-06-08 13:16 ` [PATCH v4 3/7] block: add max_hw_transfer to BlockLimits Paolo Bonzini
2021-06-08 17:48 ` Eric Blake
2021-06-09 16:12 ` Maxim Levitsky
2021-06-08 13:16 ` [PATCH v4 4/7] file-posix: try BLKSECTGET on block devices too, do not round to power of 2 Paolo Bonzini
2021-06-08 17:53 ` Eric Blake
2021-06-09 16:15 ` Maxim Levitsky
2021-06-08 13:16 ` [PATCH v4 5/7] block: feature detection for host block support Paolo Bonzini
2021-06-23 15:44 ` Max Reitz
2021-06-08 13:16 ` [PATCH v4 6/7] block: check for sys/disk.h Paolo Bonzini
2021-06-08 13:16 ` [PATCH v4 7/7] block: detect DKIOCGETBLOCKCOUNT/SIZE before use Paolo Bonzini
2021-06-23 15:47 ` Max Reitz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5be29121-b904-a990-4eda-707997004c43@redhat.com \
--to=mreitz@redhat.com \
--cc=imp@bsdimp.com \
--cc=j@getutm.app \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).