From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeSwB-0007S3-8J for qemu-devel@nongnu.org; Wed, 06 Jul 2011 10:18:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeSw9-0001Gq-5s for qemu-devel@nongnu.org; Wed, 06 Jul 2011 10:18:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeSw8-0001GY-9i for qemu-devel@nongnu.org; Wed, 06 Jul 2011 10:18:44 -0400 From: Kevin Wolf Date: Wed, 6 Jul 2011 16:21:24 +0200 Message-Id: <1309962089-7328-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1309962089-7328-1-git-send-email-kwolf@redhat.com> References: <1309962089-7328-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 3/8] block/raw-posix: Linux compat-ioctl warning workaround List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Johannes Stezenbach On Linux x86_64 host with 32bit userspace, running qemu or even just "qemu-img create -f qcow2 some.img 1G" causes a kernel warning: ioctl32(qemu-img:5296): Unknown cmd fd(3) cmd(00005326){t:'S';sz:0} arg(7fffffff) on some.img ioctl32(qemu-img:5296): Unknown cmd fd(3) cmd(801c0204){t:02;sz:28} arg(fff77350) on some.img ioctl 00005326 is CDROM_DRIVE_STATUS, ioctl 801c0204 is FDGETPRM. The warning appears because the Linux compat-ioctl handler for these ioctls only applies to block devices, while qemu also uses the ioctls on plain files. Work around by calling fstat() the ensure the ioctls are only used on block devices. Signed-off-by: Johannes Stezenbach Signed-off-by: Kevin Wolf --- block/raw-posix.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 4cd7d7a..34b64aa 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -46,6 +46,8 @@ #include #endif #ifdef __linux__ +#include +#include #include #include #include @@ -1188,6 +1190,7 @@ static int floppy_probe_device(const char *filename) int fd, ret; int prio = 0; struct floppy_struct fdparam; + struct stat st; if (strstart(filename, "/dev/fd", NULL)) prio = 50; @@ -1196,12 +1199,17 @@ static int floppy_probe_device(const char *filename) if (fd < 0) { goto out; } + ret = fstat(fd, &st); + if (ret == -1 || !S_ISBLK(st.st_mode)) { + goto outc; + } /* Attempt to detect via a floppy specific ioctl */ ret = ioctl(fd, FDGETPRM, &fdparam); if (ret >= 0) prio = 100; +outc: close(fd); out: return prio; @@ -1290,17 +1298,23 @@ static int cdrom_probe_device(const char *filename) { int fd, ret; int prio = 0; + struct stat st; fd = open(filename, O_RDONLY | O_NONBLOCK); if (fd < 0) { goto out; } + ret = fstat(fd, &st); + if (ret == -1 || !S_ISBLK(st.st_mode)) { + goto outc; + } /* Attempt to detect via a CDROM specific ioctl */ ret = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); if (ret >= 0) prio = 100; +outc: close(fd); out: return prio; -- 1.7.6