From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvO-00047A-Hi for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvK-0002lb-DK for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:54 -0400 From: Colin Lord Date: Thu, 14 Jul 2016 15:03:12 -0400 Message-Id: <1468523008-30013-17-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> Subject: [Qemu-devel] [PATCH v4 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 Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/vpc-probe.c | 9 +++++++++ block/vpc.c | 8 +------- include/block/probe.h | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 block/vpc-probe.c diff --git a/block/Makefile.objs b/block/Makefile.objs index f86ab63..6512073 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 += bochs-probe.o cloop-probe.o crypto-probe.o dmg-probe.o block-obj-y += parallels-probe.o qcow-probe.o qcow2-probe.o qed-probe.o -block-obj-y += raw-probe.o vdi-probe.o vhdx-probe.o vmdk-probe.o +block-obj-y += raw-probe.o vdi-probe.o vhdx-probe.o vmdk-probe.o vpc-probe.o common-obj-y += stream.o common-obj-y += backup.o diff --git a/block/vpc-probe.c b/block/vpc-probe.c new file mode 100644 index 0000000..afe8271 --- /dev/null +++ b/block/vpc-probe.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 43707ed..7ab3e7f 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