* [Qemu-devel] [PATCH] block: Assume raw for drives without media
@ 2010-06-01 16:50 Kevin Wolf
2010-06-01 17:15 ` Nicholas A. Bellinger
0 siblings, 1 reply; 2+ messages in thread
From: Kevin Wolf @ 2010-06-01 16:50 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf
qemu -cdrom /dev/cdrom with an empty CD-ROM drive doesn't work any more because
we try to guess the format and when this fails (because there is no medium) we
exit with an error message.
This patch should restore the old behaviour by assuming raw format for such
drives.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index d789d02..7dded4e 100644
--- a/block.c
+++ b/block.c
@@ -331,8 +331,8 @@ static BlockDriver *find_image_format(const char *filename)
if (ret < 0)
return NULL;
- /* Return the raw BlockDriver * to scsi-generic devices */
- if (bs->sg) {
+ /* Return the raw BlockDriver * to scsi-generic devices or empty drives */
+ if (bs->sg || !bdrv_is_inserted(bs)) {
bdrv_delete(bs);
return bdrv_find_format("raw");
}
--
1.6.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] block: Assume raw for drives without media
2010-06-01 16:50 [Qemu-devel] [PATCH] block: Assume raw for drives without media Kevin Wolf
@ 2010-06-01 17:15 ` Nicholas A. Bellinger
0 siblings, 0 replies; 2+ messages in thread
From: Nicholas A. Bellinger @ 2010-06-01 17:15 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel
On Tue, 2010-06-01 at 18:50 +0200, Kevin Wolf wrote:
> qemu -cdrom /dev/cdrom with an empty CD-ROM drive doesn't work any more because
> we try to guess the format and when this fails (because there is no medium) we
> exit with an error message.
>
> This patch should restore the old behaviour by assuming raw format for such
> drives.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> block.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/block.c b/block.c
> index d789d02..7dded4e 100644
> --- a/block.c
> +++ b/block.c
> @@ -331,8 +331,8 @@ static BlockDriver *find_image_format(const char *filename)
> if (ret < 0)
> return NULL;
>
> - /* Return the raw BlockDriver * to scsi-generic devices */
> - if (bs->sg) {
> + /* Return the raw BlockDriver * to scsi-generic devices or empty drives */
> + if (bs->sg || !bdrv_is_inserted(bs)) {
> bdrv_delete(bs);
> return bdrv_find_format("raw");
> }
Makes sense to me.
Acked-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-01 17:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-01 16:50 [Qemu-devel] [PATCH] block: Assume raw for drives without media Kevin Wolf
2010-06-01 17:15 ` Nicholas A. Bellinger
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).