[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 27/32] blockdev: Separate vhdx probe from its dri
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v4 27/32] blockdev: Separate vhdx probe from its driver |
Date: |
Thu, 14 Jul 2016 15:03:23 -0400 |
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 <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block.c | 1 +
block/vhdx-probe.c | 12 +++++++++---
block/vhdx.c | 1 -
include/block/probe.h | 3 ++-
4 files changed, 12 insertions(+), 5 deletions(-)
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
--
2.5.5
- [Qemu-block] [PATCH v4 24/32] blockdev: Separate qed probe from its driver, (continued)
- [Qemu-block] [PATCH v4 24/32] blockdev: Separate qed probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 29/32] blockdev: Separate vpc probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 28/32] blockdev: Separate vmdk probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 21/32] blockdev: Separate parallels probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 16/32] blockdev: Move vpc probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 18/32] blockdev: Separate cloop probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 22/32] blockdev: Separate qcow probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 30/32] blockdev: Remove the .bdrv_probe field from BlockDrivers, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 26/32] blockdev: Separate vdi probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 31/32] blockdev: Separate out bdrv_probe_device functions, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 27/32] blockdev: Separate vhdx probe from its driver,
Colin Lord <=
- [Qemu-block] [PATCH v4 32/32] blockdev: Remove bdrv_probe_device field from BlockDriver, Colin Lord, 2016/07/14
- Re: [Qemu-block] [PATCH v4 00/32] Dynamic module loading for block drivers, Paolo Bonzini, 2016/07/19
- Re: [Qemu-block] [PATCH v4 00/32] Dynamic module loading for block drivers, Max Reitz, 2016/07/22