motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

raw-posix: split hdev drivers

Browse source 
Instead of declaring one BlockDriver for all host devices declared one
for each type:  a generic one for normal disk devices, a Linux floppy
driver and a CDROM driver for Linux and FreeBSD.  This gets rid of a lot
of messy ifdefs and switching based on the type in the various removal
device methods.

block.c grows a new method to find the correct host device driver based
on OS-sepcific criteria, which will later into the actual drivers in a
later patch in this series.

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2009-06-15 13:55:19 +02:00 • committed by Christoph Hellwig
parent 90babde0ca
commit f3a5d3f8a1
2 changed files with 351 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

66
block.c
View file

@ -249,8 +249,48 @@ static BlockDriver *find_protocol(const char *filename)
return NULL;
}
/* XXX: force raw format if block or character device ? It would
simplify the BSD case */
/*
* Detect host devices. By convention, /dev/cdrom[N] is always
* recognized as a host CDROM.
*/
#ifdef _WIN32
static BlockDriver *find_hdev_driver(const char *filename)
{
if (strstart(filename, "/dev/cdrom", NULL))
return bdrv_find_format("host_device");
if (is_windows_drive(filename))
return bdrv_find_format("host_device");
return NULL;
}
#else
static BlockDriver *find_hdev_driver(const char *filename)
{
struct stat st;
#ifdef __linux__
if (strstart(filename, "/dev/fd", NULL))
return bdrv_find_format("host_floppy");
if (strstart(filename, "/dev/cd", NULL))
return bdrv_find_format("host_cdrom");
#elif defined(__FreeBSD__)
if (strstart(filename, "/dev/cd", NULL) ||
strstart(filename, "/dev/acd", NULL)) {
return bdrv_find_format("host_cdrom");
}
#else
if (strstart(filename, "/dev/cdrom", NULL))
return bdrv_find_format("host_device");
#endif
if (stat(filename, &st) >= 0 &&
(S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) {
return bdrv_find_format("host_device");
}
return NULL;
}
#endif
static BlockDriver *find_image_format(const char *filename)
{
int ret, score, score_max;
@ -258,23 +298,6 @@ static BlockDriver *find_image_format(const char *filename)
uint8_t buf[2048];
BlockDriverState *bs;
/* detect host devices. By convention, /dev/cdrom[N] is always
recognized as a host CDROM */
if (strstart(filename, "/dev/cdrom", NULL))
return bdrv_find_format("host_device");
#ifdef _WIN32
if (is_windows_drive(filename))
return bdrv_find_format("host_device");
#else
{
struct stat st;
if (stat(filename, &st) >= 0 &&
(S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) {
return bdrv_find_format("host_device");
}
}
#endif
drv = find_protocol(filename);
/* no need to test disk image formats for vvfat */
if (drv && strcmp(drv->format_name, "vvfat") == 0)
@ -394,7 +417,10 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
if (flags & BDRV_O_FILE) {
drv = find_protocol(filename);
} else if (!drv) {
drv = find_image_format(filename);
drv = find_hdev_driver(filename);
if (!drv) {
drv = find_image_format(filename);
}
}
if (!drv) {
ret = -ENOENT;