[v4,27/32] blockdev: Separate vhdx probe from its driver

Commit Message

[e-mail] July 14, 2016, 7:03 p.m. UTC

Completes the separation of the vhdx probe from the vhdx driver. The
vhdx 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]>
Reviewed-by: Max Reitz <[e-mail]>
---
 block.c               |  1 +
 block/vhdx-probe.c    | 12 +++++++++---
 block/vhdx.c          |  1 -
 include/block/probe.h |  3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

Patch

diff --git a/block.c b/block.c
index a1a0b50..941e208 100644
--- a/block.c
+++ b/block.c
@@ -71,6 +71,7 @@  static BdrvProbeFunc *format_probes[] = {
     bdrv_qed_probe,
     bdrv_raw_probe,
     bdrv_vdi_probe,
+    bdrv_vhdx_probe,
 };
 
 static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/vhdx-probe.c b/block/vhdx-probe.c
index 6c38aac..d907d6b 100644
--- a/block/vhdx-probe.c
+++ b/block/vhdx-probe.c
@@ -12,10 +12,16 @@ 
  *
  *  Therefore, we probe by looking for the vhdxfile signature "vhdxfile"
  */
-int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *bdrv_vhdx_probe(const uint8_t *buf, int buf_size,
+                            const char *filename, int *score)
 {
+    const char *format = "vhdx";
+    assert(score);
+
     if (buf_size >= 8 && !memcmp(buf, "vhdxfile", 8)) {
-        return 100;
+        *score = 100;
+        return format;
     }
-    return 0;
+    *score = 0;
+    return format;
 }
diff --git a/block/vhdx.c b/block/vhdx.c
index 2f13c61..852ef5c 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -1951,7 +1951,6 @@  static QemuOptsList vhdx_create_opts = {
 static BlockDriver bdrv_vhdx = {
     .format_name            = "vhdx",
     .instance_size          = sizeof(BDRVVHDXState),
-    .bdrv_probe             = vhdx_probe,
     .bdrv_open              = vhdx_open,
     .bdrv_close             = vhdx_close,
     .bdrv_reopen_prepare    = vhdx_reopen_prepare,
diff --git a/include/block/probe.h b/include/block/probe.h
index 86d48e2..b7eb00e 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@ 
 #ifndef PROBE_H
 #define PROBE_H
 
-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);
 const char *bdrv_bochs_probe(const uint8_t *buf, int buf_size,
@@ -24,5 +23,7 @@  const char *bdrv_raw_probe(const uint8_t *buf, int buf_size,
                            const char *filename, int *score);
 const char *bdrv_vdi_probe(const uint8_t *buf, int buf_size,
                            const char *filename, int *score);
+const char *bdrv_vhdx_probe(const uint8_t *buf, int buf_size,
+                            const char *filename, int *score);
 
 #endif