| Message ID | 1422284444-12529-6-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 01/26/2015 08:00 AM, Max Reitz wrote: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > qemu-img.c | 20 ++++++-------------- > 1 file changed, 6 insertions(+), 14 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
Am 26.01.2015 um 16:00 hat Max Reitz geschrieben: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > qemu-img.c | 20 ++++++-------------- > 1 file changed, 6 insertions(+), 14 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index 4e9a7f5..be1953d 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))); I'm only noticing it here, though you did the same in the previous patches. This can be written shorter as: qdict_put(options, "driver", 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) { Kevin
On 2015-02-02 at 13:35, Kevin Wolf wrote: > Am 26.01.2015 um 16:00 hat Max Reitz geschrieben: >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> qemu-img.c | 20 ++++++-------------- >> 1 file changed, 6 insertions(+), 14 deletions(-) >> >> diff --git a/qemu-img.c b/qemu-img.c >> index 4e9a7f5..be1953d 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))); > I'm only noticing it here, though you did the same in the previous > patches. This can be written shorter as: > > qdict_put(options, "driver", qstring_from_str(fmt)); Indeed, will do. Max >> } >> >> - 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) { > Kevin
diff --git a/qemu-img.c b/qemu-img.c index 4e9a7f5..be1953d 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) {
Signed-off-by: Max Reitz <mreitz@redhat.com> --- qemu-img.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)