diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-16 15:32:04 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-25 10:54:13 +0200 |
commit | 267cd53f5fbbbf9bdf18c526144ab0bd22ab40f8 (patch) | |
tree | f1d4c86a2668dc366311adf2b5389b9cfcc2f41e /block/file-posix.c | |
parent | feccdceed25302e1e3db744d468304705ee7c4dd (diff) | |
download | qemu-267cd53f5fbbbf9bdf18c526144ab0bd22ab40f8.zip qemu-267cd53f5fbbbf9bdf18c526144ab0bd22ab40f8.tar.gz qemu-267cd53f5fbbbf9bdf18c526144ab0bd22ab40f8.tar.bz2 |
block: try BSD disk size ioctls one after another
Try all the possible ioctls for disk size as long as they are
supported, to keep the #if ladder simple.
Extracted and cleaned up from a patch by Joelle van Dyne and
Warner Losh.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block/file-posix.c')
-rw-r--r-- | block/file-posix.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/block/file-posix.c b/block/file-posix.c index e56bb49..f16d987 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2327,39 +2327,37 @@ 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)) -#elif defined(DIOCGPART) - { - struct partinfo pi; - if (ioctl(fd, DIOCGPART, &pi) == 0) - size = pi.media_size; - else - size = 0; + if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) { + size = 0; + } +#endif +#ifdef DIOCGPART + if (size == 0) { + struct partinfo pi; + if (ioctl(fd, DIOCGPART, &pi) == 0) { + size = pi.media_size; + } } - if (size == 0) #endif #if defined(__APPLE__) && defined(__MACH__) - { + if (size == 0) { uint64_t sectors = 0; uint32_t sector_size = 0; 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: |