[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 21/32] blockdev: Separate parallels probe from it
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v4 21/32] blockdev: Separate parallels probe from its driver |
Date: |
Thu, 14 Jul 2016 15:03:17 -0400 |
Completes the separation of the parallels probe from the parallels
driver. The parallels 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/parallels-probe.c | 17 +++++++++++------
block/parallels.c | 1 -
include/block/probe.h | 3 ++-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index f7dc4a4..18974c6 100644
--- a/block.c
+++ b/block.c
@@ -65,6 +65,7 @@ static BdrvProbeFunc *format_probes[] = {
bdrv_cloop_probe,
bdrv_crypto_probe_luks,
bdrv_dmg_probe,
+ bdrv_parallels_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/parallels-probe.c b/block/parallels-probe.c
index ff2f6ba..659a09b 100644
--- a/block/parallels-probe.c
+++ b/block/parallels-probe.c
@@ -3,19 +3,24 @@
#include "block/probe.h"
#include "parallels.h"
-int parallels_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *bdrv_parallels_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score)
{
+ const char *format = "parallels";
const ParallelsHeader *ph = (const void *)buf;
+ assert(score);
+ *score = 0;
if (buf_size < sizeof(ParallelsHeader)) {
- return 0;
+ return format;
}
if ((!memcmp(ph->magic, HEADER_MAGIC, 16) ||
- !memcmp(ph->magic, HEADER_MAGIC2, 16)) &&
- (le32_to_cpu(ph->version) == HEADER_VERSION)) {
- return 100;
+ !memcmp(ph->magic, HEADER_MAGIC2, 16)) &&
+ (le32_to_cpu(ph->version) == HEADER_VERSION)) {
+ *score = 100;
+ return format;
}
- return 0;
+ return format;
}
diff --git a/block/parallels.c b/block/parallels.c
index 70e9439..88294f7 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -709,7 +709,6 @@ static QemuOptsList parallels_create_opts = {
static BlockDriver bdrv_parallels = {
.format_name = "parallels",
.instance_size = sizeof(BDRVParallelsState),
- .bdrv_probe = parallels_probe,
.bdrv_open = parallels_open,
.bdrv_close = parallels_close,
.bdrv_co_get_block_status = parallels_co_get_block_status,
diff --git a/include/block/probe.h b/include/block/probe.h
index bd5a532..090e0ae 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
#ifndef PROBE_H
#define PROBE_H
-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);
int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename);
@@ -18,5 +17,7 @@ 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);
+const char *bdrv_parallels_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score);
#endif
--
2.5.5
- [Qemu-block] [PATCH v4 17/32] blockdev: Separate bochs probe from its driver, (continued)
- [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
- [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 <=
- [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, 2016/07/14
- [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