[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 01/13] block: Make essential BlockDriver objects
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 01/13] block: Make essential BlockDriver objects public |
Date: |
Tue, 2 Dec 2014 18:32:41 +0100 |
There are some block drivers which are essential to QEMU and may not be
removed: These are raw, file and qcow2 (as the default non-raw format).
Make their BlockDriver objects public so they can be directly referenced
throughout the block layer without needing to call bdrv_find_format()
and having to deal with an error at runtime, while the real problem
occurred during linking (where raw, file or qcow2 were not linked into
qemu).
Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2.c | 2 +-
block/raw-posix.c | 2 +-
block/raw-win32.c | 2 +-
block/raw_bsd.c | 2 +-
include/block/block_int.h | 8 ++++++++
5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 8b9ffc4..cbc327b 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2847,7 +2847,7 @@ static QemuOptsList qcow2_create_opts = {
}
};
-static BlockDriver bdrv_qcow2 = {
+BlockDriver bdrv_qcow2 = {
.format_name = "qcow2",
.instance_size = sizeof(BDRVQcowState),
.bdrv_probe = qcow2_probe,
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 02e107f..2e6a919 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1684,7 +1684,7 @@ static QemuOptsList raw_create_opts = {
}
};
-static BlockDriver bdrv_file = {
+BlockDriver bdrv_file = {
.format_name = "file",
.protocol_name = "file",
.instance_size = sizeof(BDRVRawState),
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 7b58881..06243d7 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -540,7 +540,7 @@ static QemuOptsList raw_create_opts = {
}
};
-static BlockDriver bdrv_file = {
+BlockDriver bdrv_file = {
.format_name = "file",
.protocol_name = "file",
.instance_size = sizeof(BDRVRawState),
diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index 2ce5409..05b02c7 100644
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -235,7 +235,7 @@ static int raw_probe(const uint8_t *buf, int buf_size,
const char *filename)
return 1;
}
-static BlockDriver bdrv_raw = {
+BlockDriver bdrv_raw = {
.format_name = "raw",
.bdrv_probe = &raw_probe,
.bdrv_reopen_prepare = &raw_reopen_prepare,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 192fce8..06a21dd 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -414,6 +414,14 @@ struct BlockDriverState {
Error *backing_blocker;
};
+
+/* Essential block drivers which must always be statically linked into qemu,
and
+ * which therefore can be accessed without using bdrv_find_format() */
+extern BlockDriver bdrv_file;
+extern BlockDriver bdrv_raw;
+extern BlockDriver bdrv_qcow2;
+
+
int get_tmp_filename(char *filename, int size);
BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
const char *filename);
--
1.9.3
- [Qemu-devel] [PATCH v3 00/13] block: Various Coverity-spotted fixes, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 03/13] block/vvfat: qcow driver may not be found, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 04/13] block/nfs: Add create_opts, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 01/13] block: Make essential BlockDriver objects public,
Max Reitz <=
- [Qemu-devel] [PATCH v3 02/13] block: Omit bdrv_find_format for essential drivers, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 06/13] qemu-img: Check create_opts before image creation, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 07/13] qemu-img: Check create_opts before image amendment, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 05/13] block: Check create_opts before image creation, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 09/13] iotests: Add test for unsupported image creation, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 08/13] iotests: Only kill NBD server if it runs, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 10/13] qcow2: Prevent numerical overflow, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 12/13] qcow2: Respect bdrv_truncate() error, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 11/13] qcow2: Flushing the caches in qcow2_close may fail, Max Reitz, 2014/12/02
- [Qemu-devel] [PATCH v3 13/13] block/raw-posix: Fix ret in raw_open_common(), Max Reitz, 2014/12/02