From patchwork Tue Jul 5 15:24:16 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: 9214613 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 5B9F060752 for ; Tue, 5 Jul 2016 15:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A11020649 for ; Tue, 5 Jul 2016 15:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E5BE20072; Tue, 5 Jul 2016 15:39:13 +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 D66AA2624C for ; Tue, 5 Jul 2016 15:39:12 +0000 (UTC) Received: from localhost ([::1]:55870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSRM-0005fR-26 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:39:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDW-00064m-Mz 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-00005N-5Q for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDO-0008Rz-42; Tue, 05 Jul 2016 11:24:46 -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 B31658E254; Tue, 5 Jul 2016 15:24:45 +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 u65FOWuC006841; Tue, 5 Jul 2016 11:24:45 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:16 -0400 Message-Id: <1467732272-23368-17-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.26]); Tue, 05 Jul 2016 15:24:45 +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 16/32] blockdev: Move vpc 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 vpc probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/probe/vpc.c | 9 +++++++++ block/vpc.c | 8 +------- include/block/probe.h | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 block/probe/vpc.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 4cecf68..2d2691e 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -26,7 +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 probe/vdi.o probe/vhdx.o probe/vmdk.o +block-obj-y += probe/raw.o probe/vdi.o probe/vhdx.o probe/vmdk.o probe/vpc.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/vpc.c b/block/probe/vpc.c new file mode 100644 index 0000000..afe8271 --- /dev/null +++ b/block/probe/vpc.c @@ -0,0 +1,9 @@ +#include "qemu/osdep.h" +#include "block/probe.h" + +int vpc_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8)) + return 100; + return 0; +} diff --git a/block/vpc.c b/block/vpc.c index 076a7ce..cb65022 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" +#include "block/probe.h" #include "sysemu/block-backend.h" #include "qemu/module.h" #include "migration/migration.h" @@ -179,13 +180,6 @@ static uint32_t vpc_checksum(uint8_t* buf, size_t size) } -static int vpc_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8)) - return 100; - return 0; -} - static void vpc_parse_options(BlockDriverState *bs, QemuOpts *opts, Error **errp) { diff --git a/include/block/probe.h b/include/block/probe.h index 392515d..6cf878b 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -14,5 +14,6 @@ int raw_probe(const uint8_t *buf, int buf_size, const char *filename); int vdi_probe(const uint8_t *buf, int buf_size, const char *filename); int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename); int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename); +int vpc_probe(const uint8_t *buf, int buf_size, const char *filename); #endif