From patchwork Tue Jul 5 15:24:11 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: 9214623 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 A6AB56048B for ; Tue, 5 Jul 2016 15:44:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 974E1262F2 for ; Tue, 5 Jul 2016 15:44:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A05C26419; Tue, 5 Jul 2016 15:44:47 +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 17193262F2 for ; Tue, 5 Jul 2016 15:44:47 +0000 (UTC) Received: from localhost ([::1]:55904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSWj-0002I4-Vw for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:44:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDW-00064e-JW for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDU-00005V-Bn for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDK-0008Nt-FW; Tue, 05 Jul 2016 11:24:42 -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 1680BC05B1CD; 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 u65FOWu7006841; Tue, 5 Jul 2016 11:24:41 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:11 -0400 Message-Id: <1467732272-23368-12-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.32]); 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 11/32] blockdev: Move qed 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 qed probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/probe/qed.c | 18 ++++++++++++++++++ block/qed.c | 15 +-------------- include/block/probe.h | 1 + 4 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 block/probe/qed.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 23240d9..6ed2689 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -25,7 +25,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 +block-obj-y += probe/parallels.o probe/qcow.o probe/qcow2.o probe/qed.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/qed.c b/block/probe/qed.c new file mode 100644 index 0000000..c902489 --- /dev/null +++ b/block/probe/qed.c @@ -0,0 +1,18 @@ +#include "qemu/osdep.h" +#include "block/block_int.h" +#include "block/probe.h" +#include "block/qed.h" + +int bdrv_qed_probe(const uint8_t *buf, int buf_size, + const char *filename) +{ + const QEDHeader *header = (const QEDHeader *)buf; + + if (buf_size < sizeof(*header)) { + return 0; + } + if (le32_to_cpu(header->magic) != QED_MAGIC) { + return 0; + } + return 100; +} diff --git a/block/qed.c b/block/qed.c index 1206806..21d8982 100644 --- a/block/qed.c +++ b/block/qed.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bswap.h" +#include "block/probe.h" #include "trace.h" #include "qed.h" #include "qapi/qmp/qerror.h" @@ -26,20 +27,6 @@ static const AIOCBInfo qed_aiocb_info = { .aiocb_size = sizeof(QEDAIOCB), }; -static int bdrv_qed_probe(const uint8_t *buf, int buf_size, - const char *filename) -{ - const QEDHeader *header = (const QEDHeader *)buf; - - if (buf_size < sizeof(*header)) { - return 0; - } - if (le32_to_cpu(header->magic) != QED_MAGIC) { - return 0; - } - return 100; -} - /** * Check whether an image format is raw * diff --git a/include/block/probe.h b/include/block/probe.h index f9dd36e..e3e9934 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -9,5 +9,6 @@ int dmg_probe(const uint8_t *buf, int buf_size, const char *filename); 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); #endif