From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:906:ce59:b0:9b2:89ee:1eb8 with SMTP id se25csp2818907ejb; Wed, 4 Oct 2023 10:35:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEeQ2y/x+xpkNxGXGY05x8YUAKOuxwL3ngAC1XX9oofw+tuBcRiewelJFSu7J1cOFz0CqV3 X-Received: by 2002:a0c:f1c4:0:b0:65a:f206:5dda with SMTP id u4-20020a0cf1c4000000b0065af2065ddamr3045058qvl.39.1696440950184; Wed, 04 Oct 2023 10:35:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696440950; cv=none; d=google.com; s=arc-20160816; b=hQ9VlWlgX5hmK0xWSnjLc8/tNjmvQJJ27T9JF+qjs7Y2OD2mk1adi+axLAZ+z+N+bp BRk36oiuqdIndi/jMu7Cps3bMizR+K7nVCWCOIc72Ys7D9Y4tCJn8g9X5eLqU7C9JeO/ jPUVp5yMai378nLTJk65m8TU9xR1jIVezImRx9f+Dem8beX161uiUQeLH1CaT7JCmnSX TAJbxABlumlm40/w3lplqUqPBELuND9Y+KSsIoDdbe20RClszlKo3CTJhq0FCvcMQF6e kDkSjMOIOz1c2ydRvp62kuzg9Yr/WuNn6kPc2KTxJb7PGEukidnkNvBbtzoz5zqOZnVW vo9Q== 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=V8YDi+m/eJ199zGRgkP4lgwMfWKRtexFpA5JkFsqof0tp2HnF66rfyrNfcxANvP2Kc 8yp6usVfYXEndIIKg2Dgikx73nYIsqL8GGwRpIj0sVbxX3WGNTgId+ZuvY4i/t1geSJg tEEPGq2vCVBj1ts8KHbLW4QyBCqbsjTGZvt7IDUg6JXh/Z1ME+Nm8wqfwwNp24GMU7+w VDt13RIXGZYj2S29echxlOZr3flJGLEnuqz2MChKhQChMGqzSzjJZqj5WptvnYN9bGPu JTNqk/vsMTmHPlBdT0KNPUCO2Jp4MTR2Av2nIL7ccesHiuBBE9hedoX5TldN9iodSEj3 ksow== 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-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=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 c30-20020a0ca9de000000b0065afb2f6379si1637438qvb.230.2023.10.04.10.35.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 10:35:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=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 1qo5kF-0003kZ-Gu; Wed, 04 Oct 2023 13:33:11 -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 1qo5kD-0003hc-Lb for qemu-arm@nongnu.org; Wed, 04 Oct 2023 13:33:09 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qo5k8-00015k-W7 for qemu-arm@nongnu.org; Wed, 04 Oct 2023 13:33:09 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-406650da82bso350265e9.3 for ; Wed, 04 Oct 2023 10:33:03 -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=pb6McQuscYxLJgiObsdwZIhTLvHJ53naJ+mpT1J1QnvgTD493llzhRzlMniKrwRJyN i4SuChuwEfqI9+jsPHSBpvUNdP4PbBnpqbxHyEX+487Fxfq6v/4DdOrCBAHSSyuutbJw Zwh8SDWiLn4BuDbreHmx7fv9s22guj7GcSGZ324fm1FZ5zMbFhMJ1Eb0ILE3b3bZkmNh DBdz+1/evLpSS/+EuYFXmidqPYmeYrcc/scFKf2VgNOYpCLtn+fxaV5oo15UWwjQchXU 75Y1pixLMiv0+b7y5TSMjZok9/xFX+eRDCE4D1joRs7Ool5FvZnkKdU60ti9b23II+uS GLVw== X-Gm-Message-State: AOJu0YyVHLBxJHx1Nnm43reSpAjCLFvHg8ZNiuDgS8SaU6xdPWi3Uris W4Svfo9SrGTl35nnNiTF1BqAxw== 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=20Mathieu-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=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: dEwz9gXSPlwP 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; -- 2.41.0