From nobody Sat Feb 7 06:31:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 172986586791336.053518875479654; Fri, 25 Oct 2024 07:17:47 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6D2B2161E; Fri, 25 Oct 2024 10:17:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 43BC3160C; Fri, 25 Oct 2024 10:17:31 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4795915F3; Fri, 25 Oct 2024 10:17:28 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B79021463 for ; Fri, 25 Oct 2024 10:17:27 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-568-myIFi0oINVq0GRWlt2t1wA-1; Fri, 25 Oct 2024 10:17:26 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1D93F195608C for ; Fri, 25 Oct 2024 14:17:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.4]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5708E1956088 for ; Fri, 25 Oct 2024 14:17:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729865847; 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; bh=0a8OOTrxkVH13cHKu8QMlywW9FdsZGsvYFmr4gkkWW0=; b=FtzvnbMERGWDE/lti+1asAxFwjY4UdfzQFpLjrTTEU8Ccpqhq/fhbUcJAszobElWKljfCs b64iOP41VrAIybjqm6gArzJfxVJ/btIXg+ZhiWLNVvlh4Fz3U39d0cOR/E5lj3JiITnDuu dZcLzDPQqeK23nQJrZK5/cklfr8DVXU= X-MC-Unique: myIFi0oINVq0GRWlt2t1wA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH] virJSONValueFromString: Prefix error message from 'json-c' Date: Fri, 25 Oct 2024 16:17:22 +0200 Message-ID: <6be1287a5259e094f888311e230be0cbf5b70fa0.1729865842.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BFPEF6M3S4UZJSU2K3Z4UGBD4IUSP2IZ X-Message-ID-Hash: BFPEF6M3S4UZJSU2K3Z4UGBD4IUSP2IZ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1729865869962116600 Content-Type: text/plain; charset="utf-8" The error message from 'json-c' was passed along without any libvirt string which makes it hard to find in the source and isn't exactly clear when present in logs: libvirtd[843]: internal error : invalid utf-8 string Prefix the message with 'failed to parse JSON'. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- src/util/virjson.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index 42018a98b4..4a95e84f5b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1467,7 +1467,8 @@ virJSONValueFromString(const char *jsonstring) jerr =3D json_tokener_get_error(tok); if (jerr !=3D json_tokener_success) { virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", json_tokener_error_desc(jerr)); + _("failed to parse JSON: %1$s"), + json_tokener_error_desc(jerr)); goto cleanup; } ret =3D virJSONValueFromJsonC(jobj); --=20 2.47.0