From patchwork Tue Jul 5 15:24:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: clord@redhat.com X-Patchwork-Id: 9214637 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 148A86048B for ; Tue, 5 Jul 2016 15:50:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03656262AE for ; Tue, 5 Jul 2016 15:50:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E89582656B; Tue, 5 Jul 2016 15:50:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5303D262AE for ; Tue, 5 Jul 2016 15:50:18 +0000 (UTC) Received: from localhost ([::1]:55934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSc5-0007KC-FX for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:50:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDf-0006Hq-Pw for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDd-0000C0-BA for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34295) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDZ-00009F-1i; Tue, 05 Jul 2016 11:24:57 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A85B53B725; Tue, 5 Jul 2016 15:24:56 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (dhcp-17-5.bos.redhat.com [10.18.17.5]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u65FOWuR006841; Tue, 5 Jul 2016 11:24:56 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:31 -0400 Message-Id: <1467732272-23368-32-git-send-email-clord@redhat.com> In-Reply-To: <1467732272-23368-1-git-send-email-clord@redhat.com> References: <1467732272-23368-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 05 Jul 2016 15:24:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 31/32] blockdev: Separate out bdrv_probe_device functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Colin Lord , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This puts the bdrv_probe_device functions into their own files to facilitate the modularization of the block drivers. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 1 + block/probe/host_cdrom.c | 40 +++++++++++++++++++++++++++++++++++++ block/probe/host_device.c | 30 ++++++++++++++++++++++++++++ block/raw-posix.c | 51 +---------------------------------------------- block/raw-win32.c | 10 +--------- include/block/probe.h | 2 ++ 6 files changed, 75 insertions(+), 59 deletions(-) create mode 100644 block/probe/host_cdrom.c create mode 100644 block/probe/host_device.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 2d2691e..3d997e7 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -27,6 +27,7 @@ block-obj-y += crypto.o block-obj-y += probe/bochs.o probe/cloop.o probe/luks.o probe/dmg.o block-obj-y += probe/parallels.o probe/qcow.o probe/qcow2.o probe/qed.o block-obj-y += probe/raw.o probe/vdi.o probe/vhdx.o probe/vmdk.o probe/vpc.o +block-obj-y += probe/host_device.o probe/host_cdrom.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/host_cdrom.c b/block/probe/host_cdrom.c new file mode 100644 index 0000000..1886cad --- /dev/null +++ b/block/probe/host_cdrom.c @@ -0,0 +1,40 @@ +#include "qemu/osdep.h" +#include "block/probe.h" + +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +int cdrom_probe_device(const char *filename) +{ + if (strstart(filename, "/dev/cd", NULL) || + strstart(filename, "/dev/acd", NULL)) + return 100; + return 0; +} +#elif defined(__linux__) +#include +#include +int cdrom_probe_device(const char *filename) +{ + int fd, ret; + int prio = 0; + struct stat st; + + fd = qemu_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: + qemu_close(fd); +out: + return prio; +} +#endif diff --git a/block/probe/host_device.c b/block/probe/host_device.c new file mode 100644 index 0000000..ebd969b --- /dev/null +++ b/block/probe/host_device.c @@ -0,0 +1,30 @@ +#include "qemu/osdep.h" +#include "block/probe.h" +#include "qemu/cutils.h" + +#ifdef _WIN32 +int hdev_probe_device(const char *filename) +{ + if (strstart(filename, "/dev/cdrom", NULL)) + return 100; + if (is_windows_drive(filename)) + return 100; + return 0; +} +#else +int hdev_probe_device(const char *filename) +{ + struct stat st; + + /* allow a dedicated CD-ROM driver to match with a higher priority */ + if (strstart(filename, "/dev/cdrom", NULL)) + return 50; + + if (stat(filename, &st) >= 0 && + (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) { + return 100; + } + + return 0; +} +#endif diff --git a/block/raw-posix.c b/block/raw-posix.c index a6ad689..56b2952 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -28,6 +28,7 @@ #include "qemu/timer.h" #include "qemu/log.h" #include "block/block_int.h" +#include "block/probe.h" #include "qemu/module.h" #include "trace.h" #include "block/thread-pool.h" @@ -2084,22 +2085,6 @@ static void print_unmounting_directions(const char *file_name) #endif /* defined(__APPLE__) && defined(__MACH__) */ -static int hdev_probe_device(const char *filename) -{ - struct stat st; - - /* allow a dedicated CD-ROM driver to match with a higher priority */ - if (strstart(filename, "/dev/cdrom", NULL)) - return 50; - - if (stat(filename, &st) >= 0 && - (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) { - return 100; - } - - return 0; -} - static int check_hdev_writable(BDRVRawState *s) { #if defined(BLKROGET) @@ -2441,32 +2426,6 @@ static int cdrom_open(BlockDriverState *bs, QDict *options, int flags, return raw_open_common(bs, options, flags, O_NONBLOCK, errp); } -static int cdrom_probe_device(const char *filename) -{ - int fd, ret; - int prio = 0; - struct stat st; - - fd = qemu_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: - qemu_close(fd); -out: - return prio; -} - static bool cdrom_is_inserted(BlockDriverState *bs) { BDRVRawState *s = bs->opaque; @@ -2565,14 +2524,6 @@ static int cdrom_open(BlockDriverState *bs, QDict *options, int flags, return 0; } -static int cdrom_probe_device(const char *filename) -{ - if (strstart(filename, "/dev/cd", NULL) || - strstart(filename, "/dev/acd", NULL)) - return 100; - return 0; -} - static int cdrom_reopen(BlockDriverState *bs) { BDRVRawState *s = bs->opaque; diff --git a/block/raw-win32.c b/block/raw-win32.c index fd23891..44cb503 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -26,6 +26,7 @@ #include "qemu/cutils.h" #include "qemu/timer.h" #include "block/block_int.h" +#include "block/probe.h" #include "qemu/module.h" #include "raw-aio.h" #include "trace.h" @@ -615,15 +616,6 @@ static int find_device_type(BlockDriverState *bs, const char *filename) } } -static int hdev_probe_device(const char *filename) -{ - if (strstart(filename, "/dev/cdrom", NULL)) - return 100; - if (is_windows_drive(filename)) - return 100; - return 0; -} - static void hdev_parse_filename(const char *filename, QDict *options, Error **errp) { diff --git a/include/block/probe.h b/include/block/probe.h index 7facb75..2732f56 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -27,5 +27,7 @@ const char *vmdk_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *vpc_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +int hdev_probe_device(const char *filename); +int cdrom_probe_device(const char *filename); #endif