From patchwork Thu Jul 14 19:03:03 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: 9230485 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 9A81D6075D for ; Thu, 14 Jul 2016 19:22:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8058928249 for ; Thu, 14 Jul 2016 19:22:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74F6E28305; Thu, 14 Jul 2016 19:22:16 +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 1417828249 for ; Thu, 14 Jul 2016 19:22:16 +0000 (UTC) Received: from localhost ([::1]:56371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmD9-0000Ua-4x for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:22:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvB-0003kX-Lq for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvA-0002ej-Hr for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlv6-0002bs-QV; Thu, 14 Jul 2016 15:03:36 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 E18EFF6E60; Thu, 14 Jul 2016 19:03:35 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6EJ3T8U000405; Thu, 14 Jul 2016 15:03:35 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:03 -0400 Message-Id: <1468523008-30013-8-git-send-email-clord@redhat.com> In-Reply-To: <1468523008-30013-1-git-send-email-clord@redhat.com> References: <1468523008-30013-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 14 Jul 2016 19:03:35 +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 v4 07/32] blockdev: Move dmg 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 dmg probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/dmg-probe.c | 17 +++++++++++++++++ block/dmg.c | 16 +--------------- include/block/probe.h | 1 + 4 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 block/dmg-probe.c diff --git a/block/Makefile.objs b/block/Makefile.objs index aca547f..09cc64c 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 += bochs-probe.o cloop-probe.o crypto-probe.o +block-obj-y += bochs-probe.o cloop-probe.o crypto-probe.o dmg-probe.o common-obj-y += stream.o common-obj-y += backup.o diff --git a/block/dmg-probe.c b/block/dmg-probe.c new file mode 100644 index 0000000..a40281b --- /dev/null +++ b/block/dmg-probe.c @@ -0,0 +1,17 @@ +#include "qemu/osdep.h" +#include "block/probe.h" + +int dmg_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + int len; + + if (!filename) { + return 0; + } + + len = strlen(filename); + if (len > 4 && !strcmp(filename + len - 4, ".dmg")) { + return 2; + } + return 0; +} diff --git a/block/dmg.c b/block/dmg.c index b0ed89b..4bbb079 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -25,6 +25,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" +#include "block/probe.h" #include "qemu/bswap.h" #include "qemu/error-report.h" #include "qemu/module.h" @@ -66,21 +67,6 @@ typedef struct BDRVDMGState { #endif } BDRVDMGState; -static int dmg_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - int len; - - if (!filename) { - return 0; - } - - len = strlen(filename); - if (len > 4 && !strcmp(filename + len - 4, ".dmg")) { - return 2; - } - return 0; -} - static int read_uint64(BlockDriverState *bs, int64_t offset, uint64_t *result) { uint64_t buffer; diff --git a/include/block/probe.h b/include/block/probe.h index 35a8d00..267431d 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -5,5 +5,6 @@ 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); int block_crypto_probe_luks(const uint8_t *buf, int buf_size, const char *filename); +int dmg_probe(const uint8_t *buf, int buf_size, const char *filename); #endif