From patchwork Tue Mar 12 14:13:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 779741 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp2043891wrt; Tue, 12 Mar 2024 07:16:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUfhnaCWjFpHaHgPSr62uXPlr3lCn3h9N0GT46wTbmtpSYDFYecbH6uqGunOQWw1EjfMUczhH0JMR85Xetq41KX X-Google-Smtp-Source: AGHT+IE+82xyT5VaiVGERCRn7tPKc1gzkb30XYzVE/0iUKPZKhohkX13Tx0GxP74uhIZVExRtnuQ X-Received: by 2002:a05:620a:5dc5:b0:788:6bda:bd3f with SMTP id xy5-20020a05620a5dc500b007886bdabd3fmr442650qkn.69.1710252992373; Tue, 12 Mar 2024 07:16:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710252992; cv=none; d=google.com; s=arc-20160816; b=gaXuDyiTSJo0YFQnQz/GgHSq1Ih73EKiceq7pFUV2QzvhWZit28lUgAHf3+D5++DdH 0LJRwdsp0+bTGTISA7+/OOgQT3z/9MRGi6ZmozHNVgl0KQsxRii3p9/UeBNm6686WR8J L6emOidBBRGJHR3pwYcvJ70oUcw2BzWLjkaPpCy8yfqhwCmjqFzPS7TOWIXdouZR54/o iVpqayeLT1wPcspBLOGEiUrsLdtiuLScom+ZZ1N8lbWDZ57J1zsbrNC+EfvdVlMdUYt7 UP6kksKKx4mPTYHL8gBfFx0iZLR2HJIgvRrcbq+crkJ6fUBXBGAJmdKRq1zSV9MdlWt3 E2zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HcFZDgD45EqkvdlOQUrgLpUdCGTxDcVOQaK1UoOzDnw=; fh=i4ioI8lUmTcl2WtN/8i487arEjQwzVsrUlEe7C7mKeY=; b=VX0YQpwkMibBW15mi6mYEwfRNYCyHMDO4ENGMgMm1lPUfGfFAYVr1CKLev4mUP5ID0 eC5SJI3DjvW/irfj2mPFjfY6eFTqBi/hU4KlBpt4OVFX+RiW8dpmZdl8iAjMZUNYhYYU vgamYCY7UuBiM094+jshwN9+Gh6xa6q6MAQyi7KA3bYIyJs2BjyPif2sLILhxosksrW8 MlP7SlY9CD2w3gfM/bDW3BSCpLMZL9/0jtecD5QPVRgWhkZNInvXgxp2I6/AA8FJLCe2 SguQyD/q1viCVaFM0qohs3DrqYaNNzlrObfN3dxaJeb++dNywynZAgR8lcPtuGa6iq2p T1eg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YgNE66kL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v19-20020a05620a441300b0078843ec7fecsi8364475qkp.749.2024.03.12.07.16.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2024 07:16:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YgNE66kL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk2tn-0000yD-Pi; Tue, 12 Mar 2024 10:14:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2tB-0000Zs-HX for qemu-devel@nongnu.org; Tue, 12 Mar 2024 10:13:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2t4-0002Al-VQ for qemu-devel@nongnu.org; Tue, 12 Mar 2024 10:13:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710252829; h=from:from: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=HcFZDgD45EqkvdlOQUrgLpUdCGTxDcVOQaK1UoOzDnw=; b=YgNE66kLQQfGiJBax9WKPyZqCEc5QFbtTKof0vzrQqTncmOFtNW9QonmcFQnEygAPEFjdG Dfi3khW4wsxGIGtUi0ju2z2XI8wqAYVTW4c5YewU4lqC5ONeIWpfn0ckiYd3CJPUHGHJBt Ag8AfG6o8ve5gQMvZe3aKuukXuACTIY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-363-Tlr0N80fPhWfhx4TGZQR6w-1; Tue, 12 Mar 2024 10:13:46 -0400 X-MC-Unique: Tlr0N80fPhWfhx4TGZQR6w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE0A38A3D20; Tue, 12 Mar 2024 14:13:45 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99E3F37F1; Tue, 12 Mar 2024 14:13:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4444521E681B; Tue, 12 Mar 2024 15:13:43 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, philmd@linaro.org Subject: [PATCH 10/10] qapi: Inline and remove QERR_PROPERTY_VALUE_BAD definition Date: Tue, 12 Mar 2024 15:13:43 +0100 Message-ID: <20240312141343.3168265-11-armbru@redhat.com> In-Reply-To: <20240312141343.3168265-1-armbru@redhat.com> References: <20240312141343.3168265-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Address the comment added in commit 4629ed1e98 ("qerror: Finally unused, clean up"), from 2015: /* * These macros will go away, please don't use * in new code, and do not add new ones! */ Manual change. Remove the definition in include/qapi/qmp/qerror.h. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster Reviewed-by: Zhao Liu --- include/qapi/qmp/qerror.h | 3 --- hw/core/qdev-properties.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 385a4876d6..00b18e9082 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -26,9 +26,6 @@ #define QERR_MISSING_PARAMETER \ "Parameter '%s' is missing" -#define QERR_PROPERTY_VALUE_BAD \ - "Property '%s.%s' doesn't take value '%s'" - #define QERR_PROPERTY_VALUE_OUT_OF_RANGE \ "Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", maximum: %" PRId64 ")" diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 7d6fa726fd..86a583574d 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -2,7 +2,6 @@ #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qapi/qapi-types-misc.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qlist.h" #include "qemu/ctype.h" #include "qemu/error-report.h" @@ -792,7 +791,7 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, Object *obj, break; default: case -EINVAL: - error_setg(errp, QERR_PROPERTY_VALUE_BAD, + error_setg(errp, "Property '%s.%s' doesn't take value '%s'", object_get_typename(obj), name, value); break; case -ENOENT: