diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-12-02 18:32:41 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-12-10 10:31:19 +0100 |
| commit | 5f535a941e52229d81e55603eb69b2bd449b937a (patch) | |
| tree | c400f63b141d383ecb25e546beac3cc5e8e16852 /block | |
| parent | b89689f5b2d2686ef83d2be0c854a5ef6e961e13 (diff) | |
| download | qemu-5f535a941e52229d81e55603eb69b2bd449b937a.zip qemu-5f535a941e52229d81e55603eb69b2bd449b937a.tar.gz qemu-5f535a941e52229d81e55603eb69b2bd449b937a.tar.bz2 | |
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>
Diffstat (limited to 'block')
| -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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 8b9ffc4c..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, |