[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/13] block: Omit bdrv_find_format for essential
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 02/13] block: Omit bdrv_find_format for essential drivers |
Date: |
Tue, 2 Dec 2014 18:32:42 +0100 |
We can always assume raw, file and qcow2 being available; so do not use
bdrv_find_format() to locate their BlockDriver objects but statically
reference the respective objects.
Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 17 +++++------------
block/qcow2.c | 7 +++----
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/block.c b/block.c
index 591fbe4..e995008 100644
--- a/block.c
+++ b/block.c
@@ -629,7 +629,7 @@ BlockDriver *bdrv_find_protocol(const char *filename,
}
if (!path_has_protocol(filename) || !allow_protocol_prefix) {
- return bdrv_find_format("file");
+ return &bdrv_file;
}
p = strchr(filename, ':');
@@ -690,12 +690,7 @@ static int find_image_format(BlockDriverState *bs, const
char *filename,
/* Return the raw BlockDriver * to scsi-generic devices or empty drives */
if (bs->sg || !bdrv_is_inserted(bs) || bdrv_getlength(bs) == 0) {
- drv = bdrv_find_format("raw");
- if (!drv) {
- error_setg(errp, "Could not find raw image format");
- ret = -ENOENT;
- }
- *pdrv = drv;
+ *pdrv = &bdrv_raw;
return ret;
}
@@ -1315,7 +1310,6 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int
flags, Error **errp)
/* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */
char *tmp_filename = g_malloc0(PATH_MAX + 1);
int64_t total_size;
- BlockDriver *bdrv_qcow2;
QemuOpts *opts = NULL;
QDict *snapshot_options;
BlockDriverState *bs_snapshot;
@@ -1340,11 +1334,10 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int
flags, Error **errp)
goto out;
}
- bdrv_qcow2 = bdrv_find_format("qcow2");
- opts = qemu_opts_create(bdrv_qcow2->create_opts, NULL, 0,
+ opts = qemu_opts_create(bdrv_qcow2.create_opts, NULL, 0,
&error_abort);
qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size);
- ret = bdrv_create(bdrv_qcow2, tmp_filename, opts, &local_err);
+ ret = bdrv_create(&bdrv_qcow2, tmp_filename, opts, &local_err);
qemu_opts_del(opts);
if (ret < 0) {
error_setg_errno(errp, -ret, "Could not create temporary overlay "
@@ -1364,7 +1357,7 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int
flags, Error **errp)
bs_snapshot = bdrv_new();
ret = bdrv_open(&bs_snapshot, NULL, NULL, snapshot_options,
- flags, bdrv_qcow2, &local_err);
+ flags, &bdrv_qcow2, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto out;
diff --git a/block/qcow2.c b/block/qcow2.c
index cbc327b..d597b2d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1915,10 +1915,9 @@ static int qcow2_create2(const char *filename, int64_t
total_size,
* refcount of the cluster that is occupied by the header and the refcount
* table)
*/
- BlockDriver* drv = bdrv_find_format("qcow2");
- assert(drv != NULL);
ret = bdrv_open(&bs, filename, NULL, NULL,
- BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, drv, &local_err);
+ BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH,
+ &bdrv_qcow2, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto out;
@@ -1970,7 +1969,7 @@ static int qcow2_create2(const char *filename, int64_t
total_size,
/* Reopen the image without BDRV_O_NO_FLUSH to flush it before returning */
ret = bdrv_open(&bs, filename, NULL, NULL,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_BACKING,
- drv, &local_err);
+ &bdrv_qcow2, &local_err);
if (local_err) {
error_propagate(errp, local_err);
goto out;
--
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, 2014/12/02
- [Qemu-devel] [PATCH v3 02/13] block: Omit bdrv_find_format for essential drivers,
Max Reitz <=
- [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
- Re: [Qemu-devel] [PATCH v3 00/13] block: Various Coverity-spotted fixes, Kevin Wolf, 2014/12/03