[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 22/32] blockdev: Separate qcow probe from its dri
From: |
Colin Lord |
Subject: |
[Qemu-devel] [PATCH v4 22/32] blockdev: Separate qcow probe from its driver |
Date: |
Thu, 14 Jul 2016 15:03:18 -0400 |
Completes the separation of the qcow probe from the qcow driver. The
qcow 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/qcow-probe.c | 16 +++++++++++-----
block/qcow.c | 1 -
include/block/probe.h | 3 ++-
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/block.c b/block.c
index 18974c6..f531ad0 100644
--- a/block.c
+++ b/block.c
@@ -66,6 +66,7 @@ static BdrvProbeFunc *format_probes[] = {
bdrv_crypto_probe_luks,
bdrv_dmg_probe,
bdrv_parallels_probe,
+ bdrv_qcow_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/qcow-probe.c b/block/qcow-probe.c
index c5fd214..36bbd05 100644
--- a/block/qcow-probe.c
+++ b/block/qcow-probe.c
@@ -3,14 +3,20 @@
#include "block/probe.h"
#include "qcow.h"
-int qcow_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *bdrv_qcow_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score)
{
+ const char *format = "qcow";
const QCowHeader *cow_header = (const void *)buf;
+ assert(score);
if (buf_size >= sizeof(QCowHeader) &&
be32_to_cpu(cow_header->magic) == QCOW_MAGIC &&
- be32_to_cpu(cow_header->version) == QCOW_VERSION)
- return 100;
- else
- return 0;
+ be32_to_cpu(cow_header->version) == QCOW_VERSION) {
+ *score = 100;
+ return format;
+ }
+
+ *score = 0;
+ return format;
}
diff --git a/block/qcow.c b/block/qcow.c
index 6ea1164..5144c8d 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -1044,7 +1044,6 @@ static QemuOptsList qcow_create_opts = {
static BlockDriver bdrv_qcow = {
.format_name = "qcow",
.instance_size = sizeof(BDRVQcowState),
- .bdrv_probe = qcow_probe,
.bdrv_open = qcow_open,
.bdrv_close = qcow_close,
.bdrv_reopen_prepare = qcow_reopen_prepare,
diff --git a/include/block/probe.h b/include/block/probe.h
index 090e0ae..e670341 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
#ifndef PROBE_H
#define PROBE_H
-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);
int raw_probe(const uint8_t *buf, int buf_size, const char *filename);
@@ -19,5 +18,7 @@ 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);
+const char *bdrv_qcow_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score);
#endif
--
2.5.5
- [Qemu-devel] [PATCH v4 21/32] blockdev: Separate parallels probe from its driver, (continued)
- [Qemu-devel] [PATCH v4 21/32] blockdev: Separate parallels probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 14/32] blockdev: Move vhdx probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 16/32] blockdev: Move vpc probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 27/32] blockdev: Separate vhdx probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 31/32] blockdev: Separate out bdrv_probe_device functions, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 15/32] blockdev: Move vmdk probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 20/32] blockdev: Separate dmg probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 30/32] blockdev: Remove the .bdrv_probe field from BlockDrivers, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 23/32] blockdev: Separate qcow2 probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 18/32] blockdev: Separate cloop probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 22/32] blockdev: Separate qcow probe from its driver,
Colin Lord <=
- [Qemu-devel] [PATCH v4 32/32] blockdev: Remove bdrv_probe_device field from BlockDriver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 29/32] blockdev: Separate vpc probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 28/32] blockdev: Separate vmdk probe from its driver, Colin Lord, 2016/07/14
- Re: [Qemu-devel] [PATCH v4 00/32] Dynamic module loading for block drivers, Paolo Bonzini, 2016/07/19
- Re: [Qemu-devel] [PATCH v4 00/32] Dynamic module loading for block drivers, Max Reitz, 2016/07/22