From nobody Mon Feb 9 01:06:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617972792; cv=none; d=zohomail.com; s=zohoarc; b=jSAtdKtRqrdKwOTjCClNEK7oVUAsXY2DjHzpxgL8uwZyGvXsdBwyfYIlrO0eQBgywWPMEFXt5EYdky01ag9OpvWgRJXJkZeySO/L6OnBCxet4dpfmHaWY6Hr1AhNoXlwSUJ9RIaUu340C8J1C+GrYxaZkHonvihVzIOzDKA03/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617972792; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cixnlx6ByRkkdYkVWbGMLtLd2RXA794xEP2xPeTq1EA=; b=hjIyBTT63Ib2V6R7fwVcX9oywRXonoDacxA/PxviAMSQhq72f2RAVk33H+5RTqgaSH3cQShZ1OolX6MW9uBRqZIWM4Y0SbtB044dyFVClzpD8Dg5WLlwIyGq2GvO04LQlBhqZhpNsG18Vi1hUxWbGoV9B9lR9J/WNWd8YotKbqY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 161797279288641.893146631567674; Fri, 9 Apr 2021 05:53:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-480-KfqkATPhMzujahGdoaFMFQ-1; Fri, 09 Apr 2021 08:51:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3F45802B5B; Fri, 9 Apr 2021 12:51:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 90AC819C95; Fri, 9 Apr 2021 12:51:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5683D55359; Fri, 9 Apr 2021 12:51:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 139CphTk008864 for ; Fri, 9 Apr 2021 08:51:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84EA55C3E0; Fri, 9 Apr 2021 12:51:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id E02FC5C3E9 for ; Fri, 9 Apr 2021 12:51:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617972791; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cixnlx6ByRkkdYkVWbGMLtLd2RXA794xEP2xPeTq1EA=; b=G/eL2OSBCKzT+zadYPGoxyMb5zM9zYJ6gM0REXJgYHJ0OJlc7mkYAoz76ksAQRqnQZtTot ZU20msLA/ZViBpflvTPTdzuSaPXqj+EoY4+e5X2LKPnARud9JeAH6miNUQaMZmv89hvhXV Lfdz7kSjYMbTUf0XyNuj1CWpWUQOdbE= X-MC-Unique: KfqkATPhMzujahGdoaFMFQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 14/25] virTestLoadFileJSON: Don't try to unwrap JSON documents Date: Fri, 9 Apr 2021 14:50:16 +0200 Message-Id: <145a5de5f16fccffab49e1798149e92aacf83b00.1617972294.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use virFileReadAll to load the file instead of virTestLoadFile which tries to unwrap the file. Signed-off-by: Peter Krempa --- tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 0f6b3a9705..3363d7f0aa 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -313,7 +313,7 @@ virTestLoadFileJSON(const char *p, ...) if (!(path =3D virTestLoadFileGetPath(p, ap))) goto cleanup; - if (virTestLoadFile(path, &jsonstr) < 0) + if (virFileReadAll(path, INT_MAX, &jsonstr) < 0) goto cleanup; if (!(ret =3D virJSONValueFromString(jsonstr))) --=20 2.30.2