]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
block: Add missing bdrv_delete() for SG_IO BlockDriver in find_image_format()
authorNicholas A. Bellinger <nab@linux-iscsi.org>
Thu, 27 May 2010 15:56:28 +0000 (08:56 -0700)
committerKevin Wolf <kwolf@redhat.com>
Fri, 28 May 2010 11:29:17 +0000 (13:29 +0200)
This patch adds a missing bdrv_delete() call in find_image_format() so that a
SG_IO BlockDriver properly releases the temporary BlockDriverState *bs created
from bdrv_file_open()

Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Reported-by: Chris Krumme <chris.krumme@windriver.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block.c

diff --git a/block.c b/block.c
index 24c63f6338945b3c168c9f9adc436e0cb5e7f0fb..296de890b6b80d967b4db97338814671c090999b 100644 (file)
--- a/block.c
+++ b/block.c
@@ -332,8 +332,10 @@ static BlockDriver *find_image_format(const char *filename)
         return NULL;
 
     /* Return the raw BlockDriver * to scsi-generic devices */
-    if (bs->sg)
+    if (bs->sg) {
+        bdrv_delete(bs);
         return bdrv_find_format("raw");
+    }
 
     ret = bdrv_pread(bs, 0, buf, sizeof(buf));
     bdrv_delete(bs);