From e5484d339114117920753c4045bed75510215862 Mon Sep 17 00:00:00 2001 From: bellard Date: Wed, 27 Apr 2005 19:55:01 +0000 Subject: [PATCH] BSD fix git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1413 c046a42c-6fe2-441c-8c8c-71466251a162 --- block.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index cbe07a9..ce1c388 100644 --- a/block.c +++ b/block.c @@ -548,6 +548,9 @@ static int raw_open(BlockDriverState *bs, const char *filename) BDRVRawState *s = bs->opaque; int fd; int64_t size; +#ifdef _BSD + struct stat sb; +#endif fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE); if (fd < 0) { @@ -557,13 +560,11 @@ static int raw_open(BlockDriverState *bs, const char *filename) bs->read_only = 1; } #ifdef _BSD - { - struct stat sb; - if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) { + if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) { #ifdef DIOCGMEDIASIZE - if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) + if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) #endif - size = lseek(fd, 0LL, SEEK_END); + size = lseek(fd, 0LL, SEEK_END); } else #endif { -- 2.7.4