[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 26/32] blockdev: Separate vdi probe from its driv
From: |
Colin Lord |
Subject: |
[Qemu-devel] [PATCH v4 26/32] blockdev: Separate vdi probe from its driver |
Date: |
Thu, 14 Jul 2016 15:03:22 -0400 |
Completes the separation of the vdi probe from the vdi driver. The
vdi 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/vdi-probe.c | 13 ++++++++-----
block/vdi.c | 1 -
include/block/probe.h | 3 ++-
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/block.c b/block.c
index f37161d..a1a0b50 100644
--- a/block.c
+++ b/block.c
@@ -70,6 +70,7 @@ static BdrvProbeFunc *format_probes[] = {
bdrv_qcow2_probe,
bdrv_qed_probe,
bdrv_raw_probe,
+ bdrv_vdi_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/vdi-probe.c b/block/vdi-probe.c
index 42b2cc8..9c57194 100644
--- a/block/vdi-probe.c
+++ b/block/vdi-probe.c
@@ -3,24 +3,27 @@
#include "block/probe.h"
#include "vdi.h"
-int vdi_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *bdrv_vdi_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score)
{
+ const char *format = "vdi";
const VdiHeader *header = (const VdiHeader *)buf;
- int ret = 0;
+ assert(score);
+ *score = 0;
logout("\n");
if (buf_size < sizeof(*header)) {
/* Header too small, no VDI. */
} else if (le32_to_cpu(header->signature) == VDI_SIGNATURE) {
- ret = 100;
+ *score = 100;
}
- if (ret == 0) {
+ if (*score == 0) {
logout("no vdi image\n");
} else {
logout("%s", header->text);
}
- return ret;
+ return format;
}
diff --git a/block/vdi.c b/block/vdi.c
index b6db1c6..27cc5c3 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -849,7 +849,6 @@ static QemuOptsList vdi_create_opts = {
static BlockDriver bdrv_vdi = {
.format_name = "vdi",
.instance_size = sizeof(BDRVVdiState),
- .bdrv_probe = vdi_probe,
.bdrv_open = vdi_open,
.bdrv_close = vdi_close,
.bdrv_reopen_prepare = vdi_reopen_prepare,
diff --git a/include/block/probe.h b/include/block/probe.h
index 662d5d7..86d48e2 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
#ifndef PROBE_H
#define PROBE_H
-int vdi_probe(const uint8_t *buf, int buf_size, const char *filename);
int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename);
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);
@@ -23,5 +22,7 @@ const char *bdrv_qed_probe(const uint8_t *buf, int buf_size,
const char *filename, int *score);
const char *bdrv_raw_probe(const uint8_t *buf, int buf_size,
const char *filename, int *score);
+const char *bdrv_vdi_probe(const uint8_t *buf, int buf_size,
+ const char *filename, int *score);
#endif
--
2.5.5
- [Qemu-devel] [PATCH v4 07/32] blockdev: Move dmg probe to its own file, (continued)
- [Qemu-devel] [PATCH v4 07/32] blockdev: Move dmg probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 11/32] blockdev: Move qed probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 10/32] blockdev: Move qcow2 probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 09/32] blockdev: Move qcow probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 12/32] blockdev: Move raw probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 13/32] blockdev: Move vdi probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 24/32] blockdev: Separate qed probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 25/32] blockdev: Separate raw probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 17/32] blockdev: Separate bochs probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 19/32] blockdev: Separate luks probe from its driver, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 26/32] blockdev: Separate vdi probe from its driver,
Colin Lord <=
- [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