OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

BSD cdrom device access fix 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1412 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-04-26 21:59:26 +00:00
parent c747cd1fa2
commit 7674e7bf08
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
block.c
View File

@ -24,6 +24,14 @@
#include "vl.h" #include "vl.h"
#include "block_int.h" #include "block_int.h"
#ifdef _BSD
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
#include <sys/disk.h>
#endif
static BlockDriverState *bdrv_first; static BlockDriverState *bdrv_first;
static BlockDriver *first_drv; static BlockDriver *first_drv;
@ -88,18 +96,33 @@ static void get_tmp_filename(char *filename, int size)
} }
#endif #endif
/* XXX: force raw format if block or character device ? It would
simplify the BSD case */
static BlockDriver *find_image_format(const char *filename) static BlockDriver *find_image_format(const char *filename)
{ {
int fd, ret, score, score_max; int fd, ret, score, score_max;
BlockDriver *drv1, *drv; BlockDriver *drv1, *drv;
uint8_t buf[1024]; uint8_t *buf;
size_t bufsize = 1024;
fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE); fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
if (fd < 0) if (fd < 0)
return NULL; return NULL;
ret = read(fd, buf, sizeof(buf)); #ifdef DIOCGSECTORSIZE
{
unsigned int sectorsize = 512;
if (!ioctl(fd, DIOCGSECTORSIZE, &sectorsize) &&
sectorsize > bufsize)
bufsize = sectorsize;
}
#endif
buf = malloc(bufsize);
if (!buf)
return NULL;
ret = read(fd, buf, bufsize);
if (ret < 0) { if (ret < 0) {
close(fd); close(fd);
free(buf);
return NULL; return NULL;
} }
close(fd); close(fd);
@ -113,6 +136,7 @@ static BlockDriver *find_image_format(const char *filename)
drv = drv1; drv = drv1;
} }
} }
free(buf);
return drv; return drv;
} }
@ -532,7 +556,19 @@ static int raw_open(BlockDriverState *bs, const char *filename)
return -1; return -1;
bs->read_only = 1; bs->read_only = 1;
} }
size = lseek(fd, 0, SEEK_END); #ifdef _BSD
{
struct stat sb;
if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) {
#ifdef DIOCGMEDIASIZE
if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
#endif
size = lseek(fd, 0LL, SEEK_END);
} else
#endif
{
size = lseek(fd, 0, SEEK_END);
}
#ifdef _WIN32 #ifdef _WIN32
/* On Windows hosts it can happen that we're unable to get file size /* On Windows hosts it can happen that we're unable to get file size
for CD-ROM raw device (it's inherent limitation of the CDFS driver). */ for CD-ROM raw device (it's inherent limitation of the CDFS driver). */