[patch] bdrv-noclose.patch

bdrv-noclose.patch (text/plain), 741 bytes, created by Denis Kaganovich on 2013-03-27 09:41:07 UTC

--- a/block.c	2013-03-27 12:33:29.000000000 +0300
+++ b/block.c	2013-03-27 12:35:23.000000000 +0300
@@ -683,6 +683,10 @@ static int bdrv_open_common(BlockDriverS
     if (drv->bdrv_file_open) {
         if (file != NULL) {
             bdrv_swap(file, bs);
+            if (bs->file != file) {
+                g_free(file->opaque);
+                file->opaque = NULL;
+            }
             ret = 0;
         } else {
             ret = drv->bdrv_file_open(bs, filename, open_flags);
@@ -1380,7 +1384,8 @@ void bdrv_delete(BlockDriverState *bs)
     /* remove from list, if necessary */
     bdrv_make_anon(bs);
 
-    bdrv_close(bs);
+    if (bs->opaque)
+        bdrv_close(bs);
 
     assert(bs != bs_snapshots);
     g_free(bs);