Patchwork [v2] block stream: close unused files and update ->backing_hd

login
register
mail settings
Submitter Marcelo Tosatti
Date March 27, 2012, 12:22 a.m.
Message ID <20120327002210.GB8343@amt.cnet>
Download mbox | patch
Permalink /patch/148846/
State New
Headers show

Comments

Marcelo Tosatti - March 27, 2012, 12:22 a.m.
Close the now unused images that were part of the previous backing file
chain and adjust ->backing_hd, backing_filename and backing_format
properly.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=801449

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Stefan Hajnoczi - March 27, 2012, 7:13 a.m.
On Mon, Mar 26, 2012 at 09:22:10PM -0300, Marcelo Tosatti wrote:
> 
> Close the now unused images that were part of the previous backing file
> chain and adjust ->backing_hd, backing_filename and backing_format
> properly.
> 
> Fixes https://bugzilla.redhat.com/show_bug.cgi?id=801449
> 
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Kevin Wolf - April 5, 2012, 1:12 p.m.
Am 27.03.2012 09:13, schrieb Stefan Hajnoczi:
> On Mon, Mar 26, 2012 at 09:22:10PM -0300, Marcelo Tosatti wrote:
>>
>> Close the now unused images that were part of the previous backing file
>> chain and adjust ->backing_hd, backing_filename and backing_format
>> properly.
>>
>> Fixes https://bugzilla.redhat.com/show_bug.cgi?id=801449
>>
>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> 
> Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/block/stream.c b/block/stream.c
index d1b3986..5880288 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -76,6 +76,39 @@  static int coroutine_fn stream_populate(BlockDriverState *bs,
     return bdrv_co_copy_on_readv(bs, sector_num, nb_sectors, &qiov);
 }
 
+static void close_unused_images(BlockDriverState *top, BlockDriverState *base,
+                                const char *base_id)
+{
+    BlockDriverState *intermediate;
+    intermediate = top->backing_hd;
+
+    while (intermediate) {
+        BlockDriverState *unused;
+
+        /* reached base */
+        if (intermediate == base) {
+            break;
+        }
+
+        unused = intermediate;
+        intermediate = intermediate->backing_hd;
+        unused->backing_hd = NULL;
+        bdrv_delete(unused);
+    }
+    top->backing_hd = base;
+
+    pstrcpy(top->backing_file, sizeof(top->backing_file), "");
+    pstrcpy(top->backing_format, sizeof(top->backing_format), "");
+    if (base_id) {
+        pstrcpy(top->backing_file, sizeof(top->backing_file), base_id);
+        if (base->drv) {
+            pstrcpy(top->backing_format, sizeof(top->backing_format),
+                    base->drv->format_name);
+        }
+    }
+
+}
+
 /*
  * Given an image chain: [BASE] -> [INTER1] -> [INTER2] -> [TOP]
  *
@@ -221,6 +254,7 @@  retry:
             base_id = s->backing_file_id;
         }
         ret = bdrv_change_backing_file(bs, base_id, NULL);
+        close_unused_images(bs, base, base_id);
     }
 
     qemu_vfree(buf);