From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 14/14] block: Add missing bdrv_delete() for SG_IO BlockDriver in find_image_format()
Date: Fri, 28 May 2010 18:46:13 +0200 [thread overview]
Message-ID: <1275065173-24045-15-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1275065173-24045-1-git-send-email-kwolf@redhat.com>
From: Nicholas A. Bellinger <nab@linux-iscsi.org>
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 | 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
next prev parent reply other threads:[~2010-05-28 16:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-28 16:45 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 01/14] qcow2: Clear L2 table cache after write error Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 02/14] qcow2: Fix error handling in l2_allocate Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 03/14] block: Fix multiwrite with overlapping requests Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 04/14] qemu-io: Add multiwrite command Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 05/14] add support for protocol driver create_options Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 06/14] drive: allow rerror, werror and readonly for if=none Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 07/14] posix-aio-compat: Expand tabs that have crept in Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 08/14] block.h: Make BDRV_SECTOR_SIZE 64 bit safe Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 09/14] qcow2: Allow qcow2_get_cluster_offset to return errors Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 10/14] qcow2: Change l2_load to return 0/-errno Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 11/14] qcow2: Return right error code in write_refcount_block_entries Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 12/14] qcow2: Fix corruption after refblock allocation Kevin Wolf
2010-05-28 16:46 ` [Qemu-devel] [PATCH 13/14] qcow2: Fix corruption after error in update_refcount Kevin Wolf
2010-05-28 16:46 ` Kevin Wolf [this message]
2010-05-28 16:48 ` [Qemu-devel] Re: [PULL 00/14] Block patches Anthony Liguori
2010-05-28 16:51 ` Kevin Wolf
2010-05-28 16:55 ` Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275065173-24045-15-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).