From patchwork Wed Oct 4 17:31:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 729314 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp479389wrs; Wed, 4 Oct 2023 10:36:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFliQOGuE2Kahijv9YVjVv7n3rTQdcB68bQpO7WfZ2wbLHZZC99jOHSSqpgb2bMwsn0k964 X-Received: by 2002:a05:6870:2309:b0:1d5:40df:8fb1 with SMTP id w9-20020a056870230900b001d540df8fb1mr3201084oao.19.1696440989129; Wed, 04 Oct 2023 10:36:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696440989; cv=none; d=google.com; s=arc-20160816; b=MKt6U7GdEs3SP7ZcmdcsBq4oxqhXkEBb4XAQ+WSI/vujjXyBdlH5uwiJICeovF/vX/ RFX/rE01fKXHGz6Pe2FKYDFcMQApl/lRfWnRYPAcyjeVUMm48NWAOOnh03XtfptGoQU7 PS8iGSJ3m4HkCmW29GZJ5LJQMJe7vAFgiXFkav4ih+40h6rwPOcUC9e/5kk4b9iuwLaP lhZlhD3JqsY1kktvoIBi1nB0Ss5/17/4Ff1ORGaKKDnmBd9iU19c6ZRoMWhDKk0YiDuO vGviec8M1bRVzZaG9rkB0RgVfzaNlyQw9yLmn4dKowXAw0xhOJlwrizqgsC/W6TdSsNz ShZg== 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=1Q3iLFdosYlx+ShI5rJfNC7P4KhR6Nf8wUwiWyt6XeA=; fh=HDVP4gLBJFPrlJPLcYFMfWtVNMZlEWZ6fKpeuNItzQI=; b=Rk5Y1spQYJEhowVZLgId7iak+5Kqlxczx0GI+eOgThuSYCslG2LFlZJLOOn7D6/t+z Qz0tPwkEhg8RHYLJPQsHihxUJmPFXLxBl6U1cDuejfnVjQqfrJFYUC8TPx661mT2gA05 TdyxFR99nF1y2UI21TEbMjRe6g5ddFiEFFT5/jCkbsmrs7LdinfawQJ8PsPTKhWWxIqe t7lZZNgXDKQWhTjauCOVcZN8KD1laWg3cQhGb1kfAshCChQlBBvro8rhTx52S3aiBsDC NjjX233cwmamlFLWF3wjvXN2jAZJzU37MOhgp1EMJkY6O2YO9AvyZ2Wx1f98PswU6nnc /fug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mrkIyXsd; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n9-20020a0c8c09000000b006592a95dde8si1658648qvb.87.2023.10.04.10.36.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 10:36:29 -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=@linaro.org header.s=google header.b=mrkIyXsd; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qo5kP-0003tr-7X; Wed, 04 Oct 2023 13:33: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 1qo5kM-0003p5-Kr for qemu-devel@nongnu.org; Wed, 04 Oct 2023 13:33:18 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qo5k9-00015u-3A for qemu-devel@nongnu.org; Wed, 04 Oct 2023 13:33:18 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-406650da82bso350285e9.3 for ; Wed, 04 Oct 2023 10:33:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696440782; x=1697045582; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1Q3iLFdosYlx+ShI5rJfNC7P4KhR6Nf8wUwiWyt6XeA=; b=mrkIyXsd96vun4GqJrNv+VAFXfyTkJQXWTMWmlMYS8IXp26iwyqCA8qMQkqPLKI8+7 YWe2QH2TUowUsDtBaXIK5ZQ0kyRsU69E7WwToDf4jSia/0Bakii026UIWreLplhk/Smw gKCRT8/nluL+C85bOqvO+1kPIaVRBdbDHIknCa8fDqLpbYBURw65aaY0PkiWGu/PA2vE dTN3ZqSF7scxpnoPnUwMRky67qz7vxYNKBqNjk4UbnOBB/k1pTFcMVmxMqfoxh/ib8to Aear/9zYCHdBT/XCyIVnIcf2P77GhJEQUe2YTQjllIErO0owXGzr602OHPObpRan73uo NUEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696440782; x=1697045582; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1Q3iLFdosYlx+ShI5rJfNC7P4KhR6Nf8wUwiWyt6XeA=; b=ObCUYEVjBsdynwis+KS6yn6K686tAvakv6hA07jY5zUSdDwGVUcjZrVu2x+NS+RZJm 4FEvSv2FvN122ZHi4D2HsM6YWfXZLi9Yh/On/zmdOxrHBS5R1O48nbsQBVePcL1WCUSr gWbGR8/dCpPy3LlVk7fQ/cD9cmgUaLc39Eu69etfsyk9UgezCx7Rzrt+BWqiTxoHC2R2 0A5ONNpM6mbjW/A1DQL6qCPtMQhbXlmEoMjQ/fMNq8GYQoXp1Ke3TnLDSOMINaG2AXfV o+IOEXbpUR6s8AI0J4AJl/sJpD4ELcmM0E6x3NNBTNV6LfLvYHxqqMjqCaTCu9RKF2uP RgMA== X-Gm-Message-State: AOJu0YzW1zpT63sz9vLIs7GZ2SdBm2QJ4wov6J/shHW6d6LxlEZ9y4h6 Z5QWm9S9ol4Sd2c7wVf4drYfle3S4jGUawepvyA= X-Received: by 2002:adf:fec4:0:b0:31f:f9fb:d5bd with SMTP id q4-20020adffec4000000b0031ff9fbd5bdmr3006135wrs.68.1696440782655; Wed, 04 Oct 2023 10:33:02 -0700 (PDT) Received: from m1x-phil.lan (5ep85-h01-176-173-163-52.dslam.bbox.fr. [176.173.163.52]) by smtp.gmail.com with ESMTPSA id y8-20020a7bcd88000000b00406447b798bsm2019756wmj.37.2023.10.04.10.33.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Oct 2023 10:33:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth Subject: [PATCH 09/21] qapi: Inline and remove QERR_INVALID_PARAMETER_TYPE definition Date: Wed, 4 Oct 2023 19:31:44 +0200 Message-ID: <20231004173158.42591-10-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004173158.42591-1-philmd@linaro.org> References: <20231004173158.42591-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com 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, 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 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 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 changes (escaping the format in qapi/visit.py). Remove the definition in include/qapi/qmp/qerror.h. Signed-off-by: Philippe Mathieu-Daudé --- include/qapi/qmp/qerror.h | 3 --- qom/object.c | 3 ++- scripts/qapi/visit.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 63ab775dc5..b723830eff 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -17,9 +17,6 @@ * add new ones! */ -#define QERR_INVALID_PARAMETER_TYPE \ - "Invalid parameter type for '%s', expected: %s" - #define QERR_INVALID_PARAMETER_VALUE \ "Parameter '%s' expects %s" diff --git a/qom/object.c b/qom/object.c index 890fa0a106..eea61a5068 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1855,7 +1855,8 @@ static Object *object_resolve_link(Object *obj, const char *name, } else if (!target) { target = object_resolve_path(path, &ambiguous); if (target || ambiguous) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, target_type); + error_setg(errp, "Invalid parameter type for '%s', expected: %s", + name, target_type); } else { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", path); diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index c56ea4d724..4b4a442383 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -278,8 +278,8 @@ def gen_visit_alternate(name: str, variants: QAPISchemaVariants) -> str: abort(); default: assert(visit_is_input(v)); - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", - "%(name)s"); + error_setg(errp, "Invalid parameter type for '%%s', expected: %(name)s", + name ? name : "null"); /* Avoid passing invalid *obj to qapi_free_%(c_name)s() */ g_free(*obj); *obj = NULL;