From patchwork Tue Jul 5 15:24:12 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: 9214607 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 2EDB860752 for ; Tue, 5 Jul 2016 15:34:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20A1A26212 for ; Tue, 5 Jul 2016 15:34:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 153532624C; Tue, 5 Jul 2016 15:34:32 +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 B3D8426212 for ; Tue, 5 Jul 2016 15:34:31 +0000 (UTC) Received: from localhost ([::1]:55841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSMo-0000rz-SG for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:34:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDT-000619-Bm for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDR-0008U4-4x for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDL-0008Ou-7J; Tue, 05 Jul 2016 11:24:43 -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 CAE58DF201; Tue, 5 Jul 2016 15:24:42 +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 u65FOWu8006841; Tue, 5 Jul 2016 11:24:42 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:12 -0400 Message-Id: <1467732272-23368-13-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.39]); Tue, 05 Jul 2016 15:24:42 +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 12/32] blockdev: Move raw 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 Isolate raw probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 1 + block/probe/raw.c | 10 ++++++++++ block/raw_bsd.c | 9 +-------- include/block/probe.h | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 block/probe/raw.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 6ed2689..693cc97 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -26,6 +26,7 @@ block-obj-y += write-threshold.o 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 common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/raw.c b/block/probe/raw.c new file mode 100644 index 0000000..22c6bcb --- /dev/null +++ b/block/probe/raw.c @@ -0,0 +1,10 @@ +#include "qemu/osdep.h" +#include "block/probe.h" + +int raw_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + /* smallest possible positive score so that raw is used if and only if no + * other block driver works + */ + return 1; +} diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 7f63791..8f49637 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "block/block_int.h" +#include "block/probe.h" #include "qapi/error.h" #include "qemu/option.h" @@ -218,14 +219,6 @@ static void raw_close(BlockDriverState *bs) { } -static int raw_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - /* smallest possible positive score so that raw is used if and only if no - * other block driver works - */ - return 1; -} - static int raw_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz) { return bdrv_probe_blocksizes(bs->file->bs, bsz); diff --git a/include/block/probe.h b/include/block/probe.h index e3e9934..053f961 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -10,5 +10,6 @@ int parallels_probe(const uint8_t *buf, int buf_size, const char *filename); int qcow_probe(const uint8_t *buf, int buf_size, const char *filename); int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename); int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename); +int raw_probe(const uint8_t *buf, int buf_size, const char *filename); #endif