[v3,22/32] blockdev: Separate qcow probe from its driver

Commit Message

[e-mail] July 5, 2016, 3:24 p.m. UTC

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 <[e-mail]>
---
 block.c               |  1 +
 block/probe/qcow.c    | 16 +++++++++++-----
 block/qcow.c          |  1 -
 include/block/probe.h |  3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

Comments

Max Reitz July 6, 2016, 4:09 p.m. UTC | #1

On 05.07.2016 17:24, Colin Lord wrote:
> 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 <[e-mail]>
> ---
>  block.c               |  1 +
>  block/probe/qcow.c    | 16 +++++++++++-----
>  block/qcow.c          |  1 -
>  include/block/probe.h |  3 ++-
>  4 files changed, 14 insertions(+), 7 deletions(-)

Reviewed-by: Max Reitz <[e-mail]>

Patch

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