Patchwork [V3,3/7] block: Check infinite loop in bdrv_img_create()

login
register
mail settings
Submitter Xu Wang
Date July 15, 2013, 9:42 a.m.
Message ID <1373881356-3294-4-git-send-email-cngesaint@gmail.com>
Download mbox | patch
Permalink /patch/258972/
State New
Headers show

Comments

Xu Wang - July 15, 2013, 9:42 a.m.
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 <cngesaint@gmail.com>
---
 block.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/block.c b/block.c
index a06bb08..e9b9112 100644
--- a/block.c
+++ b/block.c
@@ -4685,15 +4685,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 */
             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) {