Skip to contentSkip to conversation

raw-posix: fix hdev_create

PATCH New Christoph Hellwig 1 participant 1 message May 25, 2009 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 raw-posix: fix hdev_create

We do need hdev_create unconditionally on all platforms so that qemu-img create support for host device works on all platforms.

Also relax the check to allow character devices in addition to block devices. On many Unix platforms block devices have buffered block nodes and unbuffered character device nodes, and on FreeBSD the block nodes don't even exist anymore. Also on Linux we do support the /dev/sgN scsi passthrough devices through the host device driver, and probably the old-style /dev/raw/rawN raw devices although I haven't tested that.

block/raw-posix.c +1 -10
Index: qemu/block/raw-posix.c
===================================================================
@@ -1096,7 +1096,6 @@ static int fd_open(BlockDriverState *bs)
 
 #endif /* !linux && !FreeBSD */
 
-#if defined(__linux__) || defined(__FreeBSD__)
 static int hdev_create(const char *filename, QEMUOptionParameter *options)
 {
     int fd;
@@ -1118,7 +1117,7 @@ static int hdev_create(const char *filen
 
     if (fstat(fd, &stat_buf) < 0)
         ret = -EIO;
-    else if (!S_ISBLK(stat_buf.st_mode))
+    else if (!S_ISBLK(stat_buf.st_mode) && !S_ISCHR(stat_buf.st_mode))
         ret = -EIO;
     else if (lseek(fd, 0, SEEK_END) < total_size * 512)
         ret = -ENOSPC;
@@ -1127,14 +1126,6 @@ static int hdev_create(const char *filen
     return ret;
 }
 
-#else  /* !(linux || freebsd) */
-
-static int hdev_create(const char *filename, QEMUOptionParameter *options)
-{
-    return -ENOTSUP;
-}
-#endif
-
 static BlockDriver bdrv_host_device = {
     .format_name	= "host_device",
     .instance_size	= sizeof(BDRVRawState),