From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDb-0006DZ-UC for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDa-0000AD-LY for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:59 -0400 From: Colin Lord Date: Tue, 5 Jul 2016 11:24:22 -0400 Message-Id: <1467732272-23368-23-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 22/32] blockdev: Separate qcow probe from its driver 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 Completes the separation of the qcow probe from the qcow driver. The qcow probe now returns the format in addition to the score, allowing correlation of the score and driver without the probe function being part of the driver itself. Signed-off-by: Colin Lord --- block.c | 1 + block/probe/qcow.c | 16 +++++++++++----- block/qcow.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 0f4c9f6..236e562 100644 --- a/block.c +++ b/block.c @@ -66,6 +66,7 @@ static BdrvProbeFunc *format_probes[] = { block_crypto_probe_luks, dmg_probe, parallels_probe, + qcow_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/probe/qcow.c b/block/probe/qcow.c index 6024d11..d249e02 100644 --- a/block/probe/qcow.c +++ b/block/probe/qcow.c @@ -3,14 +3,20 @@ #include "block/probe.h" #include "block/driver/qcow.h" -int qcow_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *qcow_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score) { + const char *format = "qcow"; const QCowHeader *cow_header = (const void *)buf; + assert(score); if (buf_size >= sizeof(QCowHeader) && be32_to_cpu(cow_header->magic) == QCOW_MAGIC && - be32_to_cpu(cow_header->version) == QCOW_VERSION) - return 100; - else - return 0; + be32_to_cpu(cow_header->version) == QCOW_VERSION) { + *score = 100; + return format; + } + + *score = 0; + return format; } diff --git a/block/qcow.c b/block/qcow.c index 828749c..9475ed0 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -1002,7 +1002,6 @@ static QemuOptsList qcow_create_opts = { static BlockDriver bdrv_qcow = { .format_name = "qcow", .instance_size = sizeof(BDRVQcowState), - .bdrv_probe = qcow_probe, .bdrv_open = qcow_open, .bdrv_close = qcow_close, .bdrv_reopen_prepare = qcow_reopen_prepare, diff --git a/include/block/probe.h b/include/block/probe.h index 7383a64..3aeab2d 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -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); int raw_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -19,5 +18,7 @@ const char *dmg_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *parallels_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *qcow_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score); #endif -- 2.5.5