| Message ID | 1373268366-14508-4-git-send-email-cngesaint@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 07/08 03:26, Xu Wang wrote: > Signed-off-by: Xu Wang <cngesaint@gmail.com> > --- > block.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/block.c b/block.c > index 8dc6ded..6df25d9 100644 > --- a/block.c > +++ b/block.c > @@ -4688,15 +4688,15 @@ void bdrv_img_create(const char *filename, const char *fmt, > } > > backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE); > + backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); > if (backing_file && backing_file->value.s) { > - if (!strcmp(filename, backing_file->value.s)) { > - error_setg(errp, "Error: Trying to create an image with the " > - "same filename as the backing file"); > + if (bdrv_backing_file_loop_check(filename, fmt, true, > + backing_file->value.s, Trailing whitespace. > + backing_fmt->value.s)) { > + /* There is loop exists in the backing file chain */ I see why you pass both filename and backing_file to in now, filename is not created yet so bdrv_get_backing_filename is not usable, but it needs to be checked.
diff --git a/block.c b/block.c index 8dc6ded..6df25d9 100644 --- a/block.c +++ b/block.c @@ -4688,15 +4688,15 @@ void bdrv_img_create(const char *filename, const char *fmt, } backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE); + backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); if (backing_file && backing_file->value.s) { - if (!strcmp(filename, backing_file->value.s)) { - error_setg(errp, "Error: Trying to create an image with the " - "same filename as the backing file"); + if (bdrv_backing_file_loop_check(filename, fmt, true, + backing_file->value.s, + backing_fmt->value.s)) { + /* There is loop exists in the backing file chain */ goto out; } } - - backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); if (backing_fmt && backing_fmt->value.s) { backing_drv = bdrv_find_format(backing_fmt->value.s); if (!backing_drv) {
Signed-off-by: Xu Wang <cngesaint@gmail.com> --- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)