[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.4 v2 5/6] block/raw-posix: Don't think /dev/fd/
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.4 v2 5/6] block/raw-posix: Don't think /dev/fd/<NN> is a floppy drive. |
Date: |
Tue, 7 Jul 2015 14:29:50 +0100 |
From: "Richard W.M. Jones" <address@hidden>
In libguestfs we use /dev/fd/<NN> to pass pre-opened file descriptors
to qemu-img. Lately I've discovered that although this works, qemu
believes that these are floppy disk images. That in itself isn't much
of a problem, but now qemu prints a warning about host floppy
pass-thru being deprecated.
Extend the existing test so that it ignores /dev/fd/ as well as
/dev/fdset/
A simple test of this, if you are using the bash shell, is:
qemu-img info <( cat /dev/null )
without this patch:
$ qemu-img info <( cat /dev/null )
qemu-img: Host floppy pass-through is deprecated
Support for it will be removed in a future release.
qemu-img: Could not open '/dev/fd/63': Could not refresh total sector count:
Illegal seek
with this patch:
$ qemu-img info <( cat /dev/null )
qemu-img: Could not open '/dev/fd/63': Could not refresh total sector count:
Illegal seek
Signed-off-by: Richard W.M. Jones <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Fixes: https://bugs.launchpad.net/qemu/+bug/1470536
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/raw-posix.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index cbe6574..855febe 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -2430,7 +2430,8 @@ static int floppy_probe_device(const char *filename)
struct stat st;
if (strstart(filename, "/dev/fd", NULL) &&
- !strstart(filename, "/dev/fdset/", NULL)) {
+ !strstart(filename, "/dev/fdset/", NULL) &&
+ !strstart(filename, "/dev/fd/", NULL)) {
prio = 50;
}
--
2.4.3
- [Qemu-devel] [PULL for-2.4 v2 0/6] Block patches, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 v2 2/6] block: update bdrv_drain_all()/bdrv_drain() comments, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 v2 3/6] block: Initialize local_err in bdrv_append_temp_snapshot, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 v2 4/6] block: Use bdrv_drain to replace uncessary bdrv_drain_all, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 v2 1/6] qcow2: remove unnecessary check, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 v2 5/6] block/raw-posix: Don't think /dev/fd/<NN> is a floppy drive.,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.4 v2 6/6] blockjob: add block_job_release function, Stefan Hajnoczi, 2015/07/07
- Re: [Qemu-devel] [PULL for-2.4 v2 0/6] Block patches, Peter Maydell, 2015/07/07