From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5903FC433DB for ; Mon, 15 Mar 2021 11:58:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE98864E74 for ; Mon, 15 Mar 2021 11:58:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE98864E74 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLls8-00088t-Vo for qemu-devel@archiver.kernel.org; Mon, 15 Mar 2021 07:58:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLlqh-0006xq-Gf for qemu-devel@nongnu.org; Mon, 15 Mar 2021 07:57:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLlqf-0004A7-K6 for qemu-devel@nongnu.org; Mon, 15 Mar 2021 07:57:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615809445; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TvBaUa7/nw1AEqsf3mqOVuzt8/Yxaw6K68V32TF0vQw=; b=OmcxOizrVJIq29VwpyjadkHBRalqfO32JtO+MEbYFIMm7fzi8vzdhjqp2GUWrLPQ5+9euP StD12J0imWuiVxs0blEyLREBAWOruy2uWy5lT8d2Pj2PFBZSxzimAMBJxxFv5bZU6qGcKL e/EcjYERnEpz/LkADSIWnUcAA2VB3KY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-91-aAalniYOP6usHix1k3X2Eg-1; Mon, 15 Mar 2021 07:57:21 -0400 X-MC-Unique: aAalniYOP6usHix1k3X2Eg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7592B107ACCD; Mon, 15 Mar 2021 11:57:19 +0000 (UTC) Received: from redhat.com (ovpn-115-81.ams2.redhat.com [10.36.115.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9E931037E81; Mon, 15 Mar 2021 11:56:56 +0000 (UTC) Date: Mon, 15 Mar 2021 11:56:54 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: qemu-devel@nongnu.org Subject: Re: [PATCH 14/14] block: remove support for using "file" driver with block/char devices Message-ID: References: <20210224131142.1952027-1-berrange@redhat.com> <20210224131142.1952027-15-berrange@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210224131142.1952027-15-berrange@redhat.com> User-Agent: Mutt/2.0.5 (2021-01-21) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Fam Zheng , "Michael S. Tsirkin" , libvir-list@redhat.com, Mark Cave-Ayland , Gerd Hoffmann , qemu-block@nongnu.org, Juan Quintela , Markus Armbruster , Wainer dos Santos Moschetta , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Greg Kurz , Cleber Rosa , John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Max Reitz , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Ping for anyone, especially block maintainers, willing to review this before soft freeze. On Wed, Feb 24, 2021 at 01:11:42PM +0000, Daniel P. Berrangé wrote: > The 'host_device' and 'host_cdrom' drivers must be used instead. > > Signed-off-by: Daniel P. Berrangé > --- > block/file-posix.c | 17 ++++++----------- > docs/system/deprecated.rst | 7 ------- > docs/system/removed-features.rst | 7 +++++++ > tests/qemu-iotests/226.out | 10 +++++----- > 4 files changed, 18 insertions(+), 23 deletions(-) > > diff --git a/block/file-posix.c b/block/file-posix.c > index 05079b40ca..20e14f8e96 100644 > --- a/block/file-posix.c > +++ b/block/file-posix.c > @@ -719,15 +719,9 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, > } > > if (!device) { > - if (S_ISBLK(st.st_mode)) { > - warn_report("Opening a block device as a file using the '%s' " > - "driver is deprecated", bs->drv->format_name); > - } else if (S_ISCHR(st.st_mode)) { > - warn_report("Opening a character device as a file using the '%s' " > - "driver is deprecated", bs->drv->format_name); > - } else if (!S_ISREG(st.st_mode)) { > - error_setg(errp, "A regular file was expected by the '%s' driver, " > - "but something else was given", bs->drv->format_name); > + if (!S_ISREG(st.st_mode)) { > + error_setg(errp, "'%s' driver requires '%s' to be a regular file", > + bs->drv->format_name, bs->filename); > ret = -EINVAL; > goto fail; > } else { > @@ -736,8 +730,9 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, > } > } else { > if (!(S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) { > - error_setg(errp, "'%s' driver expects either " > - "a character or block device", bs->drv->format_name); > + error_setg(errp, "'%s' driver requires '%s' to be either " > + "a character or block device", > + bs->drv->format_name, bs->filename); > ret = -EINVAL; > goto fail; > } > diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst > index dc76584e02..3a86deb450 100644 > --- a/docs/system/deprecated.rst > +++ b/docs/system/deprecated.rst > @@ -21,13 +21,6 @@ deprecated. > System emulator command line arguments > -------------------------------------- > > -``-drive file=json:{...{'driver':'file'}}`` (since 3.0) > -''''''''''''''''''''''''''''''''''''''''''''''''''''''' > - > -The 'file' driver for drives is no longer appropriate for character or host > -devices and will only accept regular files (S_IFREG). The correct driver > -for these file types is 'host_cdrom' or 'host_device' as appropriate. > - > ``QEMU_AUDIO_`` environment variables and ``-audio-help`` (since 4.0) > ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst > index 990bf7e015..1c9e384cb0 100644 > --- a/docs/system/removed-features.rst > +++ b/docs/system/removed-features.rst > @@ -59,6 +59,13 @@ would automatically enable USB support on the machine type. > When using the new syntax, USB support must be explicitly > enabled via the ``-machine usb=on`` argument. > > +``-drive file=json:{...{'driver':'file'}}`` (removed 6.0) > +''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > + > +The 'file' driver for drives is no longer appropriate for character or host > +devices and will only accept regular files (S_IFREG). The correct driver > +for these file types is 'host_cdrom' or 'host_device' as appropriate. > + > QEMU Machine Protocol (QMP) commands > ------------------------------------ > > diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out > index 42be973ff2..55504d29c4 100644 > --- a/tests/qemu-iotests/226.out > +++ b/tests/qemu-iotests/226.out > @@ -3,23 +3,23 @@ QA output created by 226 > === Testing with driver:file === > > == Testing RO == > -qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given > -qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated > +qemu-io: can't open: 'file' driver requires 'TEST_DIR/t.IMGFMT' to be a regular file > +qemu-io: can't open: 'file' driver requires '/dev/null' to be a regular file > == Testing RW == > qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory > -qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated > +qemu-io: can't open: 'file' driver requires '/dev/null' to be a regular file > > === Testing with driver:host_device === > > == Testing RO == > -qemu-io: can't open: 'host_device' driver expects either a character or block device > +qemu-io: can't open: 'host_device' driver requires 'TEST_DIR/t.IMGFMT' to be either a character or block device > == Testing RW == > qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory > > === Testing with driver:host_cdrom === > > == Testing RO == > -qemu-io: can't open: 'host_cdrom' driver expects either a character or block device > +qemu-io: can't open: 'host_cdrom' driver requires 'TEST_DIR/t.IMGFMT' to be either a character or block device > == Testing RW == > qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory > > -- > 2.29.2 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|