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=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 02178C388F7 for ; Fri, 13 Nov 2020 08:35:57 +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 70B8720936 for ; Fri, 13 Nov 2020 08:35:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WbQCg4Tc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70B8720936 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]:39626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUYl-0006w3-A8 for qemu-devel@archiver.kernel.org; Fri, 13 Nov 2020 03:35:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPl-0006C0-IU for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPg-0005i0-Kz for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mq6Apkbd/jGqgdpb8XgipiGzgRsX/xftQn76h7xW0J4=; b=WbQCg4TcdigjRNDHGihiw8UTT7Or9acFXNAo9nP7j8RGBwWVsU6cZ5DM5XJ2Z/WgF2rl5n B3MWyNG2OFzAXVTe91GREcbNZAiitnJ2Xs8c+NXhxCcg1iRiAsxqT0U/bg2yxPcqGDsY5a k9gzDiBbGkBYeRbkLucU8PKdxMGnemw= 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-394-e6hnYJv4NJu9yXfxjaLv9Q-1; Fri, 13 Nov 2020 03:26:29 -0500 X-MC-Unique: e6hnYJv4NJu9yXfxjaLv9Q-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5016810082E7 for ; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21B3F3C04 for ; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 87DB91138603; Fri, 13 Nov 2020 09:26:26 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 02/10] qerror: Eliminate QERR_ macros used in just one place Date: Fri, 13 Nov 2020 09:26:18 +0100 Message-Id: <20201113082626.2725812-3-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Markus Armbruster --- include/qapi/qmp/qerror.h | 9 --------- monitor/misc.c | 8 ++++---- net/net.c | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 3eabd451d8..c272e3fc29 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -25,21 +25,12 @@ #define QERR_DEVICE_HAS_NO_MEDIUM \ "Device '%s' has no medium" -#define QERR_DEVICE_INIT_FAILED \ - "Device '%s' could not be initialized" - #define QERR_DEVICE_IN_USE \ "Device '%s' is in use" #define QERR_DEVICE_NO_HOTPLUG \ "Device '%s' does not support hotplugging" -#define QERR_FD_NOT_FOUND \ - "File descriptor named '%s' not found" - -#define QERR_FD_NOT_SUPPLIED \ - "No file descriptor supplied via SCM_RIGHTS" - #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" diff --git a/monitor/misc.c b/monitor/misc.c index 32e6a8c13d..9aa2505cfa 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1232,7 +1232,7 @@ void qmp_getfd(const char *fdname, Error **errp) fd = qemu_chr_fe_get_msgfd(&cur_mon->chr); if (fd == -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); return; } @@ -1286,7 +1286,7 @@ void qmp_closefd(const char *fdname, Error **errp) } qemu_mutex_unlock(&cur_mon->mon_lock); - error_setg(errp, QERR_FD_NOT_FOUND, fdname); + error_setg(errp, "File descriptor named '%s' not found", fdname); } int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) @@ -1357,7 +1357,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, fd = qemu_chr_fe_get_msgfd(&mon->chr); if (fd == -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); goto error; } @@ -1410,7 +1410,7 @@ error: } else { snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id); } - error_setg(errp, QERR_FD_NOT_FOUND, fd_str); + error_setg(errp, "File descriptor named '%s' not found", fd_str); } FdsetInfoList *qmp_query_fdsets(Error **errp) diff --git a/net/net.c b/net/net.c index 794c652282..5e1b57a608 100644 --- a/net/net.c +++ b/net/net.c @@ -1008,7 +1008,7 @@ static int net_client_init1(const Netdev *netdev, bool is_netdev, Error **errp) if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) < 0) { /* FIXME drop when all init functions store an Error */ if (errp && !*errp) { - error_setg(errp, QERR_DEVICE_INIT_FAILED, + error_setg(errp, "Device '%s' could not be initialized", NetClientDriver_str(netdev->type)); } return -1; -- 2.26.2