[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 20/32] blockdev: Separate dmg probe from its driv
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v4 20/32] blockdev: Separate dmg probe from its driver |
Date: |
Thu, 14 Jul 2016 15:03:16 -0400 |
Completes the separation of the dmg probe from the dmg driver. The dmg
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/dmg-probe.c | 13 +++++++++----
block/dmg.c | 1 -
include/block/probe.h | 3 ++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 6a144cc..f7dc4a4 100644
--- a/block.c
+++ b/block.c
@@ -64,6 +64,7 @@ static BdrvProbeFunc *format_probes[] = {
bdrv_bochs_probe,
bdrv_cloop_probe,
bdrv_crypto_probe_luks,
+ bdrv_dmg_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/dmg-probe.c b/block/dmg-probe.c
index a40281b..cc6efa8 100644
--- a/block/dmg-probe.c
+++ b/block/dmg-probe.c
@@ -1,17 +1,22 @@
#include "qemu/osdep.h"
#include "block/probe.h"
-int dmg_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *bdrv_dmg_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score)
{
+ const char *format = "dmg";
int len;
+ assert(score);
+ *score = 0;
if (!filename) {
- return 0;
+ return format;
}
len = strlen(filename);
if (len > 4 && !strcmp(filename + len - 4, ".dmg")) {
- return 2;
+ *score = 2;
+ return format;
}
- return 0;
+ return format;
}
diff --git a/block/dmg.c b/block/dmg.c
index 4bbb079..8e50a6b 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -709,7 +709,6 @@ static void dmg_close(BlockDriverState *bs)
static BlockDriver bdrv_dmg = {
.format_name = "dmg",
.instance_size = sizeof(BDRVDMGState),
- .bdrv_probe = dmg_probe,
.bdrv_open = dmg_open,
.bdrv_refresh_limits = dmg_refresh_limits,
.bdrv_co_preadv = dmg_co_preadv,
diff --git a/include/block/probe.h b/include/block/probe.h
index b15dd91..bd5a532 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
#ifndef PROBE_H
#define PROBE_H
-int dmg_probe(const uint8_t *buf, int buf_size, const char *filename);
int parallels_probe(const uint8_t *buf, int buf_size, const char *filename);
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);
@@ -17,5 +16,7 @@ const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size,
const char *filename, int *score);
const char *bdrv_crypto_probe_luks(const uint8_t *buf, int buf_size,
const char *filename, int *score);
+const char *bdrv_dmg_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score);
#endif
--
2.5.5
- [Qemu-block] [PATCH v4 04/32] blockdev: Move bochs probe into separate file, (continued)
- [Qemu-block] [PATCH v4 04/32] blockdev: Move bochs probe into separate file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 02/32] blockdev: Add dynamic generation of module_block.h, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 06/32] blockdev: Move luks probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 08/32] blockdev: Move parallels probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 07/32] blockdev: Move dmg probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 10/32] blockdev: Move qcow2 probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 09/32] blockdev: Move qcow probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 13/32] blockdev: Move vdi probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 11/32] blockdev: Move qed probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 14/32] blockdev: Move vhdx probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 20/32] blockdev: Separate dmg probe from its driver,
Colin Lord <=
- [Qemu-block] [PATCH v4 12/32] blockdev: Move raw probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 17/32] blockdev: Separate bochs probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 15/32] blockdev: Move vmdk probe to its own file, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 19/32] blockdev: Separate luks probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 23/32] blockdev: Separate qcow2 probe from its driver, Colin Lord, 2016/07/14
- [Qemu-block] [PATCH v4 25/32] blockdev: Separate raw probe from its driver, Colin Lord, 2016/07/14
- [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