[Qemu-devel] [PATCH 4/4] raw-posix: cleanup ioctl methods

[Qemu-devel] [PATCH 4/4] raw-posix: cleanup ioctl methods

[Christoph Hellwig]

Rename raw_ioctl and raw_aio_ioctl to hdev_ioctl and hdev_aio_ioctl as they
are only used for the host device.  Also only add them to the method table
for the cases where we need them (generic hdev if linux and linux CDROM)
instead of declaring stubs and always add them.


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: qemu/block/raw-posix.c
===================================================================
--- qemu.orig/block/raw-posix.c	2009-05-25 09:33:56.617816515 +0200
+++ qemu/block/raw-posix.c	2009-05-25 09:43:54.438946436 +0200
@@ -1037,7 +1037,7 @@ static int fd_open(BlockDriverState *bs)
     return 0;
 }
 
-static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
+static int hdev_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
 {
     BDRVRawState *s = bs->opaque;
 
@@ -1045,7 +1045,7 @@ static int raw_ioctl(BlockDriverState *b
 }
 
 #ifdef CONFIG_AIO
-static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,
+static BlockDriverAIOCB *hdev_aio_ioctl(BlockDriverState *bs,
         unsigned long int req, void *buf,
         BlockDriverCompletionFunc *cb, void *opaque)
 {
@@ -1087,11 +1087,6 @@ static int fd_open(BlockDriverState *bs)
         return 0;
     return -EIO;
 }
-
-static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
-{
-    return -ENOTSUP;
-}
 #else /* !linux && !FreeBSD */
 
 static int fd_open(BlockDriverState *bs)
@@ -1099,17 +1094,6 @@ static int fd_open(BlockDriverState *bs)
     return 0;
 }
 
-static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
-{
-    return -ENOTSUP;
-}
-
-static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,
-        unsigned long int req, void *buf,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    return NULL;
-}
 #endif /* !linux && !FreeBSD */
 
 #if defined(__linux__) || defined(__FreeBSD__)
@@ -1171,9 +1155,11 @@ static BlockDriver bdrv_host_device = {
     .bdrv_getlength	= raw_getlength,
 
     /* generic scsi device */
-    .bdrv_ioctl         = raw_ioctl,
+#ifdef __linux__
+    .bdrv_ioctl         = hdev_ioctl,
 #ifdef CONFIG_AIO
-    .bdrv_aio_ioctl     = raw_aio_ioctl,
+    .bdrv_aio_ioctl     = hdev_aio_ioctl,
+#endif
 #endif
 };
 
@@ -1266,12 +1252,6 @@ static BlockDriver bdrv_host_floppy = {
     .bdrv_is_inserted   = floppy_is_inserted,
     .bdrv_media_changed = floppy_media_changed,
     .bdrv_eject         = floppy_eject,
-
-    /* generic scsi device */
-    .bdrv_ioctl         = raw_ioctl,
-#ifdef CONFIG_AIO
-    .bdrv_aio_ioctl     = raw_aio_ioctl,
-#endif
 };
 
 static int cdrom_open(BlockDriverState *bs, const char *filename, int flags)
@@ -1351,9 +1331,9 @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_set_locked    = cdrom_set_locked,
 
     /* generic scsi device */
-    .bdrv_ioctl         = raw_ioctl,
+    .bdrv_ioctl         = hdev_ioctl,
 #ifdef CONFIG_AIO
-    .bdrv_aio_ioctl     = raw_aio_ioctl,
+    .bdrv_aio_ioctl     = hdev_aio_ioctl,
 #endif
 };
 #endif /* __linux__ */
@@ -1465,12 +1445,6 @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_is_inserted   = cdrom_is_inserted,
     .bdrv_eject         = cdrom_eject,
     .bdrv_set_locked    = cdrom_set_locked,
-
-    /* generic scsi device */
-    .bdrv_ioctl         = raw_ioctl,
-#ifdef CONFIG_AIO
-    .bdrv_aio_ioctl     = raw_aio_ioctl,
-#endif
 };
 #endif /* __FreeBSD__ */