From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Colin Lord 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> Subject: [Qemu-devel] [PATCH v3 16/32] blockdev: Move vpc probe to its own file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, Colin Lord Isolates vpc probe as part of the modularization process. Signed-off-by: Colin Lord --- 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 -- 2.5.5