[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/14] qemu-img: Use blk_new_open() in img_open()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 05/14] qemu-img: Use blk_new_open() in img_open() |
Date: |
Thu, 22 Jan 2015 15:10:02 -0500 |
Signed-off-by: Max Reitz <address@hidden>
---
qemu-img.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 7876258..f82f62b 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -291,32 +291,24 @@ static BlockBackend *img_open(const char *id, const char
*filename,
{
BlockBackend *blk;
BlockDriverState *bs;
- BlockDriver *drv;
char password[256];
Error *local_err = NULL;
- int ret;
-
- blk = blk_new_with_bs(id, &error_abort);
- bs = blk_bs(blk);
+ QDict *options = NULL;
if (fmt) {
- drv = bdrv_find_format(fmt);
- if (!drv) {
- error_report("Unknown file format '%s'", fmt);
- goto fail;
- }
- } else {
- drv = NULL;
+ options = qdict_new();
+ qdict_put_obj(options, "driver", QOBJECT(qstring_from_str(fmt)));
}
- ret = bdrv_open(&bs, filename, NULL, NULL, flags, drv, &local_err);
- if (ret < 0) {
+ blk = blk_new_open(id, filename, NULL, options, flags, &local_err);
+ if (!blk) {
error_report("Could not open '%s': %s", filename,
error_get_pretty(local_err));
error_free(local_err);
goto fail;
}
+ bs = blk_bs(blk);
if (bdrv_is_encrypted(bs) && require_io) {
qprintf(quiet, "Disk image '%s' is encrypted.\n", filename);
if (read_password(password, sizeof(password)) < 0) {
--
2.1.0
- [Qemu-devel] [PATCH v2 00/14] block: Remove "growable", add blk_new_open(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 04/14] block/xen: Use blk_new_open() in blk_connect(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 05/14] qemu-img: Use blk_new_open() in img_open(),
Max Reitz <=
- [Qemu-devel] [PATCH v2 01/14] block: Lift some BDS functions to the BlockBackend, Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 07/14] qemu-img: Use BlockBackend as far as possible, Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 03/14] blockdev: Use blk_new_open() in blockdev_init(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 02/14] block: Add blk_new_open(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 09/14] qemu-io: Use blk_new_open() in openfile(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 08/14] qemu-nbd: Use blk_new_open() in main(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 12/14] block: Clamp BlockBackend requests, Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 06/14] qemu-img: Use blk_new_open() in img_rebase(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 13/14] block: Remove "growable" from BDS, Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 10/14] qemu-io: Remove "growable" option, Max Reitz, 2015/01/22