[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 20/32] blockdev: Separate dmg probe from its driv
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v3 20/32] blockdev: Separate dmg probe from its driver |
Date: |
Tue, 5 Jul 2016 11:24:20 -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>
---
block.c | 1 +
block/dmg.c | 1 -
block/probe/dmg.c | 13 +++++++++----
include/block/probe.h | 3 ++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index d936da1..7dbe201 100644
--- a/block.c
+++ b/block.c
@@ -64,6 +64,7 @@ static BdrvProbeFunc *format_probes[] = {
bochs_probe,
cloop_probe,
block_crypto_probe_luks,
+ dmg_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/dmg.c b/block/dmg.c
index 2c70687..945cc00 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -704,7 +704,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_co_preadv = dmg_co_preadv,
.bdrv_close = dmg_close,
diff --git a/block/probe/dmg.c b/block/probe/dmg.c
index a40281b..5415b04 100644
--- a/block/probe/dmg.c
+++ b/block/probe/dmg.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 *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/include/block/probe.h b/include/block/probe.h
index e3bf04e..ef6629f 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 *cloop_probe(const uint8_t *buf, int buf_size,
const char *filename,
int *score);
const char *block_crypto_probe_luks(const uint8_t *buf, int buf_size,
const char *filename, int *score);
+const char *dmg_probe(const uint8_t *buf, int buf_size, const char *filename,
+ int *score);
#endif
--
2.5.5
- [Qemu-block] [PATCH v3 19/32] blockdev: Separate luks probe from its driver, (continued)
- [Qemu-block] [PATCH v3 19/32] blockdev: Separate luks probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 16/32] blockdev: Move vpc probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 11/32] blockdev: Move qed probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 14/32] blockdev: Move vhdx probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 15/32] blockdev: Move vmdk probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 20/32] blockdev: Separate dmg probe from its driver,
Colin Lord <=
- [Qemu-block] [PATCH v3 18/32] blockdev: Separate cloop probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 22/32] blockdev: Separate qcow probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 26/32] blockdev: Separate vdi probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 30/32] blockdev: Remove the .bdrv_probe field from BlockDrivers, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 27/32] blockdev: Separate vhdx probe from its driver, Colin Lord, 2016/07/05