| Message ID | 20170203120254.15062-7-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 03.02.2017 13:02, Daniel P. Berrange wrote: > The qemu-img dd/convert commands will create a image file and > then try to open it. Historically it has been possible to open > new files without passing any options. With encrypted files > though, the *key-secret options are mandatory, so we need to > provide those options when opening the newly created file. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > qemu-img.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 47 insertions(+), 4 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index dc4c6eb..98522dd 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -319,6 +319,49 @@ static BlockBackend *img_open_file(const char *filename, > } > > > +static int img_add_key_secrets(void *opaque, > + const char *name, const char *value, > + Error **errp) > +{ > + QDict **options = opaque; > + > + if (g_str_has_suffix(name, "key-secret")) { > + if (!*options) { > + *options = qdict_new(); > + } > + qdict_put(*options, name, qstring_from_str(value)); > + } > + > + return 0; > +} > + > +static BlockBackend *img_open_new_file(const char *filename, > + QemuOpts *create_opts, > + const char *fmt, int flags, > + bool writethrough, bool quiet) > +{ > + BlockBackend *blk; > + Error *local_err = NULL; > + QDict *options = NULL; > + > + if (fmt) { > + options = qdict_new(); > + qdict_put(options, "driver", qstring_from_str(fmt)); > + } > + > + qemu_opt_foreach(create_opts, img_add_key_secrets, &options, NULL); It would probably be easier to just unconditionally create an options QDict. It doesn't hurt if it's empty. Anyway: Reviewed-by: Max Reitz <mreitz@redhat.com> > + > + blk = blk_new_open(filename, NULL, options, flags, &local_err); > + if (!blk) { > + error_reportf_err(local_err, "Could not open '%s': ", filename); > + return NULL; > + } > + blk_set_enable_write_cache(blk, !writethrough); > + > + return blk; > +} > + > + > static BlockBackend *img_open(bool image_opts, > const char *filename, > const char *fmt, int flags, bool writethrough, > @@ -2115,8 +2158,8 @@ static int img_convert(int argc, char **argv) > * That has to wait for bdrv_create to be improved > * to allow filenames in option syntax > */ > - out_blk = img_open_file(out_filename, out_fmt, > - flags, writethrough, quiet); > + out_blk = img_open_new_file(out_filename, opts, out_fmt, > + flags, writethrough, quiet); > } > if (!out_blk) { > ret = -1; > @@ -4206,8 +4249,8 @@ static int img_dd(int argc, char **argv) > * That has to wait for bdrv_create to be improved > * to allow filenames in option syntax > */ > - blk2 = img_open_file(out.filename, out_fmt, > - BDRV_O_RDWR, false, false); > + blk2 = img_open_new_file(out.filename, opts, out_fmt, > + BDRV_O_RDWR, false, false); > } > > if (!blk2) { >
On Fri, Feb 03, 2017 at 11:39:35PM +0100, Max Reitz wrote: > On 03.02.2017 13:02, Daniel P. Berrange wrote: > > The qemu-img dd/convert commands will create a image file and > > then try to open it. Historically it has been possible to open > > new files without passing any options. With encrypted files > > though, the *key-secret options are mandatory, so we need to > > provide those options when opening the newly created file. > > > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > > --- > > qemu-img.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- > > 1 file changed, 47 insertions(+), 4 deletions(-) > > > > diff --git a/qemu-img.c b/qemu-img.c > > index dc4c6eb..98522dd 100644 > > --- a/qemu-img.c > > +++ b/qemu-img.c > > @@ -319,6 +319,49 @@ static BlockBackend *img_open_file(const char *filename, > > } > > > > > > +static int img_add_key_secrets(void *opaque, > > + const char *name, const char *value, > > + Error **errp) > > +{ > > + QDict **options = opaque; > > + > > + if (g_str_has_suffix(name, "key-secret")) { > > + if (!*options) { > > + *options = qdict_new(); > > + } > > + qdict_put(*options, name, qstring_from_str(value)); > > + } > > + > > + return 0; > > +} > > + > > +static BlockBackend *img_open_new_file(const char *filename, > > + QemuOpts *create_opts, > > + const char *fmt, int flags, > > + bool writethrough, bool quiet) > > +{ > > + BlockBackend *blk; > > + Error *local_err = NULL; > > + QDict *options = NULL; > > + > > + if (fmt) { > > + options = qdict_new(); > > + qdict_put(options, "driver", qstring_from_str(fmt)); > > + } > > + > > + qemu_opt_foreach(create_opts, img_add_key_secrets, &options, NULL); > > It would probably be easier to just unconditionally create an options > QDict. It doesn't hurt if it's empty. Ok, I will make that change. > Anyway: > > Reviewed-by: Max Reitz <mreitz@redhat.com> > > > + > > + blk = blk_new_open(filename, NULL, options, flags, &local_err); > > + if (!blk) { > > + error_reportf_err(local_err, "Could not open '%s': ", filename); > > + return NULL; > > + } > > + blk_set_enable_write_cache(blk, !writethrough); > > + > > + return blk; it seems I'm also leaking "options" so will adda QDECREF too > > +} > > + > > + Regards, Daniel
On Mon, Feb 20, 2017 at 12:46:52PM +0000, Daniel P. Berrange wrote: > On Fri, Feb 03, 2017 at 11:39:35PM +0100, Max Reitz wrote: > > On 03.02.2017 13:02, Daniel P. Berrange wrote: > > > The qemu-img dd/convert commands will create a image file and > > > then try to open it. Historically it has been possible to open > > > new files without passing any options. With encrypted files > > > though, the *key-secret options are mandatory, so we need to > > > provide those options when opening the newly created file. > > > > > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > > > --- > > > qemu-img.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- > > > 1 file changed, 47 insertions(+), 4 deletions(-) > > > > > > diff --git a/qemu-img.c b/qemu-img.c > > > index dc4c6eb..98522dd 100644 > > > --- a/qemu-img.c > > > +++ b/qemu-img.c > > > @@ -319,6 +319,49 @@ static BlockBackend *img_open_file(const char *filename, > > > } > > > > > > > > > +static int img_add_key_secrets(void *opaque, > > > + const char *name, const char *value, > > > + Error **errp) > > > +{ > > > + QDict **options = opaque; > > > + > > > + if (g_str_has_suffix(name, "key-secret")) { > > > + if (!*options) { > > > + *options = qdict_new(); > > > + } > > > + qdict_put(*options, name, qstring_from_str(value)); > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +static BlockBackend *img_open_new_file(const char *filename, > > > + QemuOpts *create_opts, > > > + const char *fmt, int flags, > > > + bool writethrough, bool quiet) > > > +{ > > > + BlockBackend *blk; > > > + Error *local_err = NULL; > > > + QDict *options = NULL; > > > + > > > + if (fmt) { > > > + options = qdict_new(); > > > + qdict_put(options, "driver", qstring_from_str(fmt)); > > > + } > > > + > > > + qemu_opt_foreach(create_opts, img_add_key_secrets, &options, NULL); > > > > It would probably be easier to just unconditionally create an options > > QDict. It doesn't hurt if it's empty. > > Ok, I will make that change. > > > Anyway: > > > > Reviewed-by: Max Reitz <mreitz@redhat.com> > > > > > + > > > + blk = blk_new_open(filename, NULL, options, flags, &local_err); > > > + if (!blk) { > > > + error_reportf_err(local_err, "Could not open '%s': ", filename); > > > + return NULL; > > > + } > > > + blk_set_enable_write_cache(blk, !writethrough); > > > + > > > + return blk; > > it seems I'm also leaking "options" so will adda QDECREF too Actually I'm wrong here - I forgot this is an unusual case where blk_new_open grabs the existing reference rather than incref'ing it. Regards, Daniel
diff --git a/qemu-img.c b/qemu-img.c index dc4c6eb..98522dd 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -319,6 +319,49 @@ static BlockBackend *img_open_file(const char *filename, } +static int img_add_key_secrets(void *opaque, + const char *name, const char *value, + Error **errp) +{ + QDict **options = opaque; + + if (g_str_has_suffix(name, "key-secret")) { + if (!*options) { + *options = qdict_new(); + } + qdict_put(*options, name, qstring_from_str(value)); + } + + return 0; +} + +static BlockBackend *img_open_new_file(const char *filename, + QemuOpts *create_opts, + const char *fmt, int flags, + bool writethrough, bool quiet) +{ + BlockBackend *blk; + Error *local_err = NULL; + QDict *options = NULL; + + if (fmt) { + options = qdict_new(); + qdict_put(options, "driver", qstring_from_str(fmt)); + } + + qemu_opt_foreach(create_opts, img_add_key_secrets, &options, NULL); + + blk = blk_new_open(filename, NULL, options, flags, &local_err); + if (!blk) { + error_reportf_err(local_err, "Could not open '%s': ", filename); + return NULL; + } + blk_set_enable_write_cache(blk, !writethrough); + + return blk; +} + + static BlockBackend *img_open(bool image_opts, const char *filename, const char *fmt, int flags, bool writethrough, @@ -2115,8 +2158,8 @@ static int img_convert(int argc, char **argv) * That has to wait for bdrv_create to be improved * to allow filenames in option syntax */ - out_blk = img_open_file(out_filename, out_fmt, - flags, writethrough, quiet); + out_blk = img_open_new_file(out_filename, opts, out_fmt, + flags, writethrough, quiet); } if (!out_blk) { ret = -1; @@ -4206,8 +4249,8 @@ static int img_dd(int argc, char **argv) * That has to wait for bdrv_create to be improved * to allow filenames in option syntax */ - blk2 = img_open_file(out.filename, out_fmt, - BDRV_O_RDWR, false, false); + blk2 = img_open_new_file(out.filename, opts, out_fmt, + BDRV_O_RDWR, false, false); } if (!blk2) {
The qemu-img dd/convert commands will create a image file and then try to open it. Historically it has been possible to open new files without passing any options. With encrypted files though, the *key-secret options are mandatory, so we need to provide those options when opening the newly created file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- qemu-img.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-)