[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V4 3/5] block: Check infinite loop in bdrv_img_c
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH V4 3/5] block: Check infinite loop in bdrv_img_create() |
Date: |
Mon, 22 Jul 2013 16:44:11 +0800 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Mon, 07/22 04:05, Xu Wang wrote:
> Backing file loop should be checked before qemu-img create command
> execution. If loop was found, qemu-img create should be stopped and
> an error was printed.
>
> Signed-off-by: Xu Wang <address@hidden>
> ---
> block.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/block.c b/block.c
> index 3e23b67..9daf63c 100644
> --- a/block.c
> +++ b/block.c
> @@ -4735,15 +4735,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,
> + backing_file->value.s,
> + backing_fmt->value.s)) {
> + /* There is loop exists in the backing file chain */
Please add error message here as other error paths do.
> 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) {
> --
> 1.8.1.4
>
--
Fam
- [Qemu-devel] [PATCH V4 0/5] Redefine and export backing file loop check, Xu Wang, 2013/07/22
- [Qemu-devel] [PATCH V4 1/5] block/qemu-img: Refine and export infinite loop checking in collect_image_info_list(), Xu Wang, 2013/07/22
- [Qemu-devel] [PATCH V4 2/5] block: Add WIN32 platform support for backing_file_loop_check(), Xu Wang, 2013/07/22
- [Qemu-devel] [PATCH V4 3/5] block: Check infinite loop in bdrv_img_create(), Xu Wang, 2013/07/22
- Re: [Qemu-devel] [PATCH V4 3/5] block: Check infinite loop in bdrv_img_create(),
Fam Zheng <=
- [Qemu-devel] [PATCH V4 4/5] block: Add backing file loop check in change_backing_file(), Xu Wang, 2013/07/22
- [Qemu-devel] [PATCH V4 5/5] block: Add infinite loop check in drive_init(), Xu Wang, 2013/07/22