[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/6] block: detect DKIOCGETBLOCKCOUNT/SIZE before use
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 6/6] block: detect DKIOCGETBLOCKCOUNT/SIZE before use |
Date: |
Mon, 24 May 2021 18:36:45 +0200 |
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 e83f34a960..34bd413553 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2311,8 +2311,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;
@@ -2321,9 +2324,7 @@ again:
else
size = 0;
}
- if (size == 0)
-#endif
-#if defined(__APPLE__) && defined(__MACH__)
+#elif defined(DKIOCGETBLOCKCOUNT) && defined(DKIOCGETBLOCKSIZE)
{
uint64_t sectors = 0;
uint32_t sector_size = 0;
@@ -2331,19 +2332,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:
--
2.31.1
- [PATCH v2 0/6] block: file-posix queue, Paolo Bonzini, 2021/05/24
- [PATCH v2 1/6] scsi-generic: pass max_segments via max_iov field in BlockLimits, Paolo Bonzini, 2021/05/24
- [PATCH v2 3/6] file-posix: fix max_iov for /dev/sg devices, Paolo Bonzini, 2021/05/24
- [PATCH v2 2/6] file-posix: try BLKSECTGET on block devices too, do not round to power of 2, Paolo Bonzini, 2021/05/24
- [PATCH v2 4/6] block: feature detection for host block support, Paolo Bonzini, 2021/05/24
- [PATCH v2 6/6] block: detect DKIOCGETBLOCKCOUNT/SIZE before use,
Paolo Bonzini <=
- [PATCH v2 5/6] block: check for sys/disk.h, Paolo Bonzini, 2021/05/24