From nobody Thu Nov 6 06:15:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539604550962798.6067714655493; Mon, 15 Oct 2018 04:55:50 -0700 (PDT) Received: from localhost ([::1]:51819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC1TF-0005M6-Cl for importer@patchew.org; Mon, 15 Oct 2018 07:55:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC1R0-00045c-EU for qemu-devel@nongnu.org; Mon, 15 Oct 2018 07:53:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gC1Qu-0001uZ-Tl for qemu-devel@nongnu.org; Mon, 15 Oct 2018 07:53:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gC1Qu-0001u4-Jj for qemu-devel@nongnu.org; Mon, 15 Oct 2018 07:53:12 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7928C04BE20; Mon, 15 Oct 2018 11:53:11 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 320982B589; Mon, 15 Oct 2018 11:53:11 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AEA4D1132D7F; Mon, 15 Oct 2018 13:53:09 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 15 Oct 2018 13:52:37 +0200 Message-Id: <20181015115309.17089-4-armbru@redhat.com> In-Reply-To: <20181015115309.17089-1-armbru@redhat.com> References: <20181015115309.17089-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 15 Oct 2018 11:53:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 03/35] block: Use warn_report() & friends to report warnings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Hitoshi Mitake , Peter Lieven , Ronnie Sahlberg , Liu Yuan , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Calling error_report() in a function that takes an Error ** argument is suspicious. Convert a few that are actually warnings to warn_report(). While there, split warnings consisting of multiple sentences to conform to conventions spelled out in warn_report()'s contract, and improve a rather useless warning in sheepdog.c. Cc: Kevin Wolf Cc: Ronnie Sahlberg Cc: Paolo Bonzini Cc: Peter Lieven Cc: Hitoshi Mitake Cc: Liu Yuan Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- block/bochs.c | 8 ++++---- block/cloop.c | 8 ++++---- block/dmg.c | 8 ++++---- block/iscsi.c | 2 +- block/rbd.c | 12 ++++++------ block/sheepdog.c | 2 +- block/vvfat.c | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/block/bochs.c b/block/bochs.c index 50c630047b..36c1b45bd2 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -112,10 +112,10 @@ static int bochs_open(BlockDriverState *bs, QDict *op= tions, int flags, } =20 if (!bdrv_is_read_only(bs)) { - error_report("Opening bochs images without an explicit read-only= =3Don " - "option is deprecated. Future versions will refuse to= " - "open the image instead of automatically marking the " - "image read-only."); + warn_report("Opening bochs images without an explicit read-only=3D= on " + "option is deprecated"); + error_printf("Future versions may refuse to open the image " + "instead of automatically marking it read-only.\n"); ret =3D bdrv_set_read_only(bs, true, errp); /* no write support ye= t */ if (ret < 0) { return ret; diff --git a/block/cloop.c b/block/cloop.c index 2be68987bd..a558e67cb0 100644 --- a/block/cloop.c +++ b/block/cloop.c @@ -74,10 +74,10 @@ static int cloop_open(BlockDriverState *bs, QDict *opti= ons, int flags, } =20 if (!bdrv_is_read_only(bs)) { - error_report("Opening cloop images without an explicit read-only= =3Don " - "option is deprecated. Future versions will refuse to= " - "open the image instead of automatically marking the " - "image read-only."); + warn_report("Opening cloop images without an explicit read-only=3D= on " + "option is deprecated"); + error_printf("Future versions may refuse to open the image " + "instead of automatically marking it read-only.\n"); ret =3D bdrv_set_read_only(bs, true, errp); if (ret < 0) { return ret; diff --git a/block/dmg.c b/block/dmg.c index c9b3c519c4..9fb814460d 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -420,10 +420,10 @@ static int dmg_open(BlockDriverState *bs, QDict *opti= ons, int flags, } =20 if (!bdrv_is_read_only(bs)) { - error_report("Opening dmg images without an explicit read-only=3Do= n " - "option is deprecated. Future versions will refuse to= " - "open the image instead of automatically marking the " - "image read-only."); + warn_report("Opening dmg images without an explicit read-only=3Don= " + "option is deprecated"); + error_printf("Future versions may refuse to open the image " + "instead of automatically marking it read-only.\n"); ret =3D bdrv_set_read_only(bs, true, errp); if (ret < 0) { return ret; diff --git a/block/iscsi.c b/block/iscsi.c index bb69faf34a..73998c2860 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1844,7 +1844,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *op= tions, int flags, iscsi_set_timeout(iscsi, timeout); #else if (timeout) { - error_report("iSCSI: ignoring timeout value for libiscsi <1.15.0"); + warn_report("iSCSI: ignoring timeout value for libiscsi <1.15.0"); } #endif =20 diff --git a/block/rbd.c b/block/rbd.c index 014c68d629..6e26bac170 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -750,8 +750,8 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, /* Take care whenever deciding to actually deprecate; once this ab= ility * is removed, we will not be able to open any images with legacy-= styled * backing image strings. */ - error_report("RBD options encoded in the filename as keyvalue pair= s " - "is deprecated"); + warn_report("RBD options encoded in the filename as keyvalue pairs= " + "is deprecated"); } =20 /* Remove the processed options from the QDict (the visitor processes @@ -781,10 +781,10 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, * leave as-is */ if (s->snap !=3D NULL) { if (!bdrv_is_read_only(bs)) { - error_report("Opening rbd snapshots without an explicit " - "read-only=3Don option is deprecated. Future vers= ions " - "will refuse to open the image instead of " - "automatically marking the image read-only."); + warn_report("Opening rbd snapshots without an explicit " + "read-only=3Don option is deprecated"); + error_printf("Future versions may refuse to open the image " + "instead of automatically marking it read-only.\n= "); r =3D bdrv_set_read_only(bs, true, &local_err); if (r < 0) { error_propagate(errp, local_err); diff --git a/block/sheepdog.c b/block/sheepdog.c index b229a664d9..0125df9d49 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -572,7 +572,7 @@ static int connect_to_sdog(BDRVSheepdogState *s, Error = **errp) if (s->addr->type =3D=3D SOCKET_ADDRESS_TYPE_INET && fd >=3D 0) { int ret =3D socket_set_nodelay(fd); if (ret < 0) { - error_report("%s", strerror(errno)); + warn_report("can't set TCP_NODELAY: %s", strerror(errno)); } } =20 diff --git a/block/vvfat.c b/block/vvfat.c index fc41841a5c..8f3f9e9a93 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1263,10 +1263,10 @@ static int vvfat_open(BlockDriverState *bs, QDict *= options, int flags, goto fail; } } else if (!bdrv_is_read_only(bs)) { - error_report("Opening non-rw vvfat images without an explicit " - "read-only=3Don option is deprecated. Future versions= " - "will refuse to open the image instead of " - "automatically marking the image read-only."); + warn_report("Opening non-rw vvfat images without an explicit " + "read-only=3Don option is deprecated"); + error_printf("Future versions may refuse to open the image " + "instead of automatically marking it read-only.\n"); /* read only is the default for safety */ ret =3D bdrv_set_read_only(bs, true, &local_err); if (ret < 0) { --=20 2.17.1