From patchwork Tue Jul 7 12:08:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 492155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 92D311402C2 for ; Tue, 7 Jul 2015 22:11:53 +1000 (AEST) Received: from localhost ([::1]:57038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCRj5-0002dX-E8 for incoming@patchwork.ozlabs.org; Tue, 07 Jul 2015 08:11:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCRg5-0006NE-LN for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:08:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCRfz-0006j9-QC for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:08:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCRfz-0006il-L6 for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:08:39 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 65D01345A87; Tue, 7 Jul 2015 12:08:39 +0000 (UTC) Received: from localhost (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t67C8cjX014148; Tue, 7 Jul 2015 08:08:38 -0400 From: Stefan Hajnoczi To: Date: Tue, 7 Jul 2015 13:08:23 +0100 Message-Id: <1436270904-2855-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1436270904-2855-1-git-send-email-stefanha@redhat.com> References: <1436270904-2855-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Peter Maydell , "Richard W.M. Jones" , Stefan Hajnoczi Subject: [Qemu-devel] [PULL for-2.4 6/7] block/raw-posix: Don't think /dev/fd/ is a floppy drive. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Richard W.M. Jones" In libguestfs we use /dev/fd/ 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 Reviewed-by: Markus Armbruster Message-id: 1435761614-31358-1-git-send-email-rjones@redhat.com Fixes: https://bugs.launchpad.net/qemu/+bug/1470536 Signed-off-by: Stefan Hajnoczi --- 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; }