Received: from [140.186.70.92] (port=51362 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OI2iB-0007cY-4Y for qemu-devel@nongnu.org; Fri, 28 May 2010 12:47:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OI2i9-0008LI-F6 for qemu-devel@nongnu.org; Fri, 28 May 2010 12:47:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42705) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OI2i9-0008LB-93 for qemu-devel@nongnu.org; Fri, 28 May 2010 12:47:05 -0400 From: Kevin Wolf Date: Fri, 28 May 2010 18:46:13 +0200 Message-Id: <1275065173-24045-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1275065173-24045-1-git-send-email-kwolf@redhat.com> References: <1275065173-24045-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 14/14] block: Add missing bdrv_delete() for SG_IO BlockDriver in find_image_format() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Nicholas A. Bellinger 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 Reported-by: Chris Krumme Signed-off-by: Kevin Wolf --- block.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 24c63f6..296de89 100644 --- 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); -- 1.6.6.1