@@ -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 =
@@ -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;
}
@@ -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,
@@ -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