[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 28/32] blockdev: Separate vmdk probe from its dri
From: |
Colin Lord |
Subject: |
[Qemu-devel] [PATCH v3 28/32] blockdev: Separate vmdk probe from its driver |
Date: |
Tue, 5 Jul 2016 11:24:28 -0400 |
Completes the separation of the vmdk probe from the vmdk driver. The
vmdk 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/probe/vmdk.c | 23 +++++++++++++++--------
block/vmdk.c | 1 -
include/block/probe.h | 3 ++-
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/block.c b/block.c
index cc48279..9b839df 100644
--- a/block.c
+++ b/block.c
@@ -72,6 +72,7 @@ static BdrvProbeFunc *format_probes[] = {
raw_probe,
vdi_probe,
vhdx_probe,
+ vmdk_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/probe/vmdk.c b/block/probe/vmdk.c
index cb9bd3d..305a95c 100644
--- a/block/probe/vmdk.c
+++ b/block/probe/vmdk.c
@@ -3,17 +3,22 @@
#include "block/probe.h"
#include "block/driver/vmdk.h"
-int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *vmdk_probe(const uint8_t *buf, int buf_size, const char *filename,
+ int *score)
{
+ const char *format = "vmdk";
uint32_t magic;
+ assert(score);
+ *score = 0;
if (buf_size < 4) {
- return 0;
+ return format;
}
magic = be32_to_cpu(*(uint32_t *)buf);
if (magic == VMDK3_MAGIC ||
magic == VMDK4_MAGIC) {
- return 100;
+ *score = 100;
+ return format;
} else {
const char *p = (const char *)buf;
const char *end = p + buf_size;
@@ -36,7 +41,7 @@ int vmdk_probe(const uint8_t *buf, int buf_size, const char
*filename)
}
/* only accept blank lines before 'version=' line */
if (p == end || *p != '\n') {
- return 0;
+ return format;
}
p++;
continue;
@@ -44,17 +49,19 @@ int vmdk_probe(const uint8_t *buf, int buf_size, const char
*filename)
if (end - p >= strlen("version=X\n")) {
if (strncmp("version=1\n", p, strlen("version=1\n")) == 0 ||
strncmp("version=2\n", p, strlen("version=2\n")) == 0) {
- return 100;
+ *score = 100;
+ return format;
}
}
if (end - p >= strlen("version=X\r\n")) {
if (strncmp("version=1\r\n", p, strlen("version=1\r\n")) == 0
||
strncmp("version=2\r\n", p, strlen("version=2\r\n")) == 0)
{
- return 100;
+ *score = 100;
+ return format;
}
}
- return 0;
+ return format;
}
- return 0;
+ return format;
}
}
diff --git a/block/vmdk.c b/block/vmdk.c
index d22db95..1cf63b4 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2335,7 +2335,6 @@ static QemuOptsList vmdk_create_opts = {
static BlockDriver bdrv_vmdk = {
.format_name = "vmdk",
.instance_size = sizeof(BDRVVmdkState),
- .bdrv_probe = vmdk_probe,
.bdrv_open = vmdk_open,
.bdrv_check = vmdk_check,
.bdrv_reopen_prepare = vmdk_reopen_prepare,
diff --git a/include/block/probe.h b/include/block/probe.h
index 3e2e328..13df1d3 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
#ifndef PROBE_H
#define PROBE_H
-int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename);
int vpc_probe(const uint8_t *buf, int buf_size, const char *filename);
const char *bochs_probe(const uint8_t *buf, int buf_size, const char *filename,
int *score);
@@ -25,5 +24,7 @@ const char *vdi_probe(const uint8_t *buf, int buf_size, const
char *filename,
int *score);
const char *vhdx_probe(const uint8_t *buf, int buf_size, const char *filename,
int *score);
+const char *vmdk_probe(const uint8_t *buf, int buf_size, const char *filename,
+ int *score);
#endif
--
2.5.5
- Re: [Qemu-devel] [PATCH v3 15/32] blockdev: Move vmdk probe to its own file, (continued)
- [Qemu-devel] [PATCH v3 06/32] blockdev: Move luks probe to its own file, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 13/32] blockdev: Move vdi probe to its own file, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 18/32] blockdev: Separate cloop probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 11/32] blockdev: Move qed probe to its own file, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 28/32] blockdev: Separate vmdk probe from its driver,
Colin Lord <=
- [Qemu-devel] [PATCH v3 24/32] blockdev: Separate qed probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 19/32] blockdev: Separate luks probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 14/32] blockdev: Move vhdx probe to its own file, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 23/32] blockdev: Separate qcow2 probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 26/32] blockdev: Separate vdi probe from its driver, Colin Lord, 2016/07/05