From patchwork Tue Jul 5 15:24:05 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: 9214595 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 79D7B60752 for ; Tue, 5 Jul 2016 15:29:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C11A25D97 for ; Tue, 5 Jul 2016 15:29:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FBAD26247; Tue, 5 Jul 2016 15:29:48 +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 0777025D97 for ; Tue, 5 Jul 2016 15:29:48 +0000 (UTC) Received: from localhost ([::1]:55815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSIF-0002fZ-43 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:29:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDL-0005ux-Vo for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDK-0008Nw-B8 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDG-0008Kj-1n; Tue, 05 Jul 2016 11:24:38 -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 9C3CD85547; Tue, 5 Jul 2016 15:24:37 +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 u65FOWu1006841; Tue, 5 Jul 2016 11:24:36 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:05 -0400 Message-Id: <1467732272-23368-6-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.28]); Tue, 05 Jul 2016 15:24:37 +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 05/32] blockdev: Move cloop probe to its own file 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 Isolates cloop probing function as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/cloop.c | 16 +--------------- block/probe/cloop.c | 17 +++++++++++++++++ include/block/probe.h | 1 + 4 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 block/probe/cloop.c diff --git a/block/Makefile.objs b/block/Makefile.objs index bc0c2aa..3b98001 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -24,7 +24,7 @@ block-obj-y += accounting.o dirty-bitmap.o block-obj-y += write-threshold.o block-obj-y += crypto.o -block-obj-y += probe/bochs.o +block-obj-y += probe/bochs.o probe/cloop.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/cloop.c b/block/cloop.c index ea5a92b..bf9fb75 100644 --- a/block/cloop.c +++ b/block/cloop.c @@ -25,6 +25,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" +#include "block/probe.h" #include "qemu/module.h" #include "qemu/bswap.h" #include @@ -44,21 +45,6 @@ typedef struct BDRVCloopState { z_stream zstream; } BDRVCloopState; -static int cloop_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - const char *magic_version_2_0 = "#!/bin/sh\n" - "#V2.0 Format\n" - "modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n"; - int length = strlen(magic_version_2_0); - if (length > buf_size) { - length = buf_size; - } - if (!memcmp(magic_version_2_0, buf, length)) { - return 2; - } - return 0; -} - static int cloop_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { diff --git a/block/probe/cloop.c b/block/probe/cloop.c new file mode 100644 index 0000000..955c29c --- /dev/null +++ b/block/probe/cloop.c @@ -0,0 +1,17 @@ +#include "qemu/osdep.h" +#include "block/probe.h" + +int cloop_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + const char *magic_version_2_0 = "#!/bin/sh\n" + "#V2.0 Format\n" + "modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n"; + int length = strlen(magic_version_2_0); + if (length > buf_size) { + length = buf_size; + } + if (!memcmp(magic_version_2_0, buf, length)) { + return 2; + } + return 0; +} diff --git a/include/block/probe.h b/include/block/probe.h index 6450ca1..ed1a60b 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -2,5 +2,6 @@ #define PROBE_H int bochs_probe(const uint8_t *buf, int buf_size, const char *filename); +int cloop_probe(const uint8_t *buf, int buf_size, const char *filename); #endif