diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-12-02 18:32:41 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-01-07 15:07:12 -0600 |
| commit | cdeb85cf241fccd7995e5c62b8cee7bb23dcac86 (patch) | |
| tree | 82f1ee6653f5dbeeeeab23684221fc3076910dcb | |
| parent | b28d7b585a2f58b5eaee523aad1b15713b212031 (diff) | |
| download | qemu-cdeb85cf241fccd7995e5c62b8cee7bb23dcac86.tar.gz | |
block: Make essential BlockDriver objects public
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: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 5f535a941e52229d81e55603eb69b2bd449b937a)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | block/qcow2.c | 2 | ||||
| -rw-r--r-- | block/raw-posix.c | 2 | ||||
| -rw-r--r-- | block/raw-win32.c | 2 | ||||
| -rw-r--r-- | block/raw_bsd.c | 2 | ||||
| -rw-r--r-- | include/block/block_int.h | 8 |
5 files changed, 12 insertions, 4 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 1e3ab6bd02..2695e2bbb5 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2404,7 +2404,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 87fc170037..2d51f2635c 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1585,7 +1585,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 902eab6100..0f24dd8aa8 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 f82f4c25df..431af8f6ea 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -173,7 +173,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 7b541a0691..21b871833f 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -395,6 +395,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); void bdrv_set_io_limits(BlockDriverState *bs, |