ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-img: Use blk_new_open() in img_open() 

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1423162705-32065-8-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Max Reitz 2015-02-05 13:58:16 -05:00 committed by Stefan Hajnoczi
parent 9a925356e3
commit 5bd313266b
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qemu-img.c
View File

@ -293,32 +293,24 @@ static BlockBackend *img_open(const char *id, const char *filename,
{ {
BlockBackend *blk; BlockBackend *blk;
BlockDriverState *bs; BlockDriverState *bs;
BlockDriver *drv;
char password[256]; char password[256];
Error *local_err = NULL; Error *local_err = NULL;
int ret; QDict *options = NULL;
blk = blk_new_with_bs(id, &error_abort);
bs = blk_bs(blk);
if (fmt) { if (fmt) {
drv = bdrv_find_format(fmt); options = qdict_new();
if (!drv) { qdict_put(options, "driver", qstring_from_str(fmt));
error_report("Unknown file format '%s'", fmt);
goto fail;
}
} else {
drv = NULL;
} }
ret = bdrv_open(&bs, filename, NULL, NULL, flags, drv, &local_err); blk = blk_new_open(id, filename, NULL, options, flags, &local_err);
if (ret < 0) { if (!blk) {
error_report("Could not open '%s': %s", filename, error_report("Could not open '%s': %s", filename,
error_get_pretty(local_err)); error_get_pretty(local_err));
error_free(local_err); error_free(local_err);
goto fail; goto fail;
} }
bs = blk_bs(blk);
if (bdrv_is_encrypted(bs) && require_io) { if (bdrv_is_encrypted(bs) && require_io) {
qprintf(quiet, "Disk image '%s' is encrypted.\n", filename); qprintf(quiet, "Disk image '%s' is encrypted.\n", filename);
if (read_password(password, sizeof(password)) < 0) { if (read_password(password, sizeof(password)) < 0) {