From patchwork Wed Apr 24 08:03:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 791505 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp700341wrq; Wed, 24 Apr 2024 01:05:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgoi1EWqCv3K+GzVx5D3uHAf1JXe7IUT3H4Hq6WDqs7PsT5R5ZPZCvPcYiatdQ95hFStFLj3Y0YwCEDdfwmber X-Google-Smtp-Source: AGHT+IEMuHoI/3TSrGGM4x/9dlPX75I6Sr/qcIIFat66Was1Z5dBesDAsSRfTgzy+/odxvYT2pVZ X-Received: by 2002:a05:620a:59:b0:78d:743f:34ab with SMTP id t25-20020a05620a005900b0078d743f34abmr2207105qkt.65.1713945915805; Wed, 24 Apr 2024 01:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713945915; cv=none; d=google.com; s=arc-20160816; b=t8xJRuzuUflzZCi8orcDGcek8OKziBCLZpjnSFsyoLU9vzOT9Sm1xEBOC2DFsW335M Wo8YN49dxAM3m+2So5mZ7z4DWJwraH055U7TAOGwSRixE0z00cl5v7cNPzm3m/tldqLR fZFEXHbQNooJMm7IPnQ2EgfBLp+DUybcFceXAoAb5oZsGp7zLq+RyXZqzsYiWb3WejSe UOWALshmlQ/ywECeGhNfEKs5S4NIRsPWmwkcFuChZRy5eIfz6fdub6Mz7X96ZzxRWA44 rC3waT5uoQeYZsMmNtppfxMlvvb+cF8wuee+O4sK+Ti5PvcspayHCHCbqnB1n5Gbo/qd YEsQ== 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=yY7Lyt8jbClugq7sDetbkp4p8g2FdKdPefPysU+ox9U=; fh=jgXZUdNI3mIRMXo4FO+maZv4rlmk7uZiHGIRmgw3yY8=; b=QNO+n8jA3dFcOUwGDB33vugm/Ox9lbcoNNB9nA4cWo0QLhlzlQlUVSlP72AnnVXJlh v4z4NPNznjoy0RgGj4K90G3oDWi8aZAV66ymczyPCtOUNKOVs84vomDMy0tea1pD7HA2 jkbrcgXrjNg6RRi1aAyYVM332yI9X4CKJrGhUIApYVOVNxnI7qmmnK8367aSebaakodK firh0/qC/46l3h9z4LWlTTxo/YDBZJRe7s9TJp5oa4jLO0op9pIw9B/qMyJ+dhmgqI3z 6uNe4m8rurjSW3UnlTsaThZ8rMgruDDISEJah8eq5iVH5Z656VRcbe6/Dno6UpVxV6B/ ijjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KG7Kau5q; 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 r1-20020a05620a298100b0078ef5f6e18dsi16277100qkp.694.2024.04.24.01.05.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 01:05:15 -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=KG7Kau5q; 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 1rzXc4-000709-Kb; Wed, 24 Apr 2024 04:04:21 -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 1rzXbZ-0005w3-Tb for qemu-devel@nongnu.org; Wed, 24 Apr 2024 04:03:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzXbW-0003oj-Tj for qemu-devel@nongnu.org; Wed, 24 Apr 2024 04:03:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713945825; 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=yY7Lyt8jbClugq7sDetbkp4p8g2FdKdPefPysU+ox9U=; b=KG7Kau5qByNbMZurxfCxEkJLfkxbYBGgoeTNduzc2fwyxZKMxJIxLgJuX7AJ+kYAFCbshi bv6C8YbZphDjbJXLmytISv4mm+vhUO5EWoN/dIS+w7+5upJvWOkxGuHrKeBUgmfNNRpmy1 ZhwqgvbdtnyEBeraTdtTrnykuk480R0= 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-186-f4WgmtguOB2o3NQYoFgtQQ-1; Wed, 24 Apr 2024 04:03:39 -0400 X-MC-Unique: f4WgmtguOB2o3NQYoFgtQQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 464E5104B502; Wed, 24 Apr 2024 08:03:39 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.247]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 25A3940C6CC0; Wed, 24 Apr 2024 08:03:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5426021EE971; Wed, 24 Apr 2024 10:03:37 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PULL 10/10] qapi: Inline and remove QERR_PROPERTY_VALUE_BAD definition Date: Wed, 24 Apr 2024 10:03:37 +0200 Message-ID: <20240424080337.2782594-11-armbru@redhat.com> In-Reply-To: <20240424080337.2782594-1-armbru@redhat.com> References: <20240424080337.2782594-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.133.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.67, 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_H4=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.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 Message-ID: <20240312141343.3168265-11-armbru@redhat.com> 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: