From nobody Sun Feb 8 17:48:49 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 1725545048532500.47206226209835; Thu, 5 Sep 2024 07:04:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6CEE417EB; Thu, 5 Sep 2024 10:04:07 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E975D165B; Thu, 5 Sep 2024 09:54:59 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AA74E16F9; Thu, 5 Sep 2024 09:54:54 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 0F2D91756 for ; Thu, 5 Sep 2024 09:50:29 -0400 (EDT) Received: from mx-prod-mc-02.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-247-6AmiXZHmPt6hzx26rMJ5yQ-1; Thu, 05 Sep 2024 09:50:27 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D232A1953956 for ; Thu, 5 Sep 2024 13:50:26 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3E26F30001AB for ; Thu, 5 Sep 2024 13:50:26 +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=3.0 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_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725544228; 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: in-reply-to:in-reply-to:references:references; bh=CE9bUwa11tTNuPsKxt1JtnLPLvADN9Z19L9RTWp8WoY=; b=bSDV6AHtsneXADk4GF6RGysLqZ1Mi8DpzzwpZby8/Z//YPNPN5v8bDxW6j+FV9MyFNvQtO BaTNJW16oE1UXINHj1Ii3JUHGyZLqV/tuNjxzE0ov2iXpfMSoZjAU+KrPqmBTZdnBssLZ+ JObLu68lfd+OIDTCg2VYDds3MUeDDoM= X-MC-Unique: 6AmiXZHmPt6hzx26rMJ5yQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCHv2 03/15] build: introduce WITH_JSON Date: Thu, 5 Sep 2024 15:49:30 +0200 Message-ID: <1a6ac49fc9d1d7e8472d4950fa4d545863c68344.1725544182.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UFULKKYEFB5HUHB6TIYI5WB5J22KBWCM X-Message-ID-Hash: UFULKKYEFB5HUHB6TIYI5WB5J22KBWCM X-MailFrom: jtomko@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: 1725545049960116600 Content-Type: text/plain; charset="utf-8" Some tests depend on WITH_YAJL even though the actual library used does not make a difference. Introduce WITH_JSON for a smoother transition. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- meson.build | 1 + tests/meson.build | 6 +++--- tests/virnetdaemontest.c | 2 +- tests/virstoragetest.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index eb4b608e85..0c7ae1b68b 100644 --- a/meson.build +++ b/meson.build @@ -1409,6 +1409,7 @@ if yajl_dep.found() endif =20 conf.set('WITH_YAJL', 1) + conf.set('WITH_JSON', 1) endif =20 =20 diff --git a/tests/meson.build b/tests/meson.build index 2f1eda1f95..700a5d4049 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -329,7 +329,7 @@ if host_machine.system() =3D=3D 'linux' { 'name': 'virscsitest' }, { 'name': 'virusbtest' }, ] - if conf.has('WITH_YAJL') + if conf.has('WITH_JSON') tests +=3D [ { 'name': 'virnetdevopenvswitchtest' }, ] @@ -406,7 +406,7 @@ if conf.has('WITH_NETWORK') ] endif =20 -if conf.has('WITH_NODE_DEVICES') and conf.has('WITH_YAJL') +if conf.has('WITH_NODE_DEVICES') and conf.has('WITH_JSON') tests +=3D [ { 'name': 'nodedevmdevctltest', 'link_with': [ node_device_driver_impl= ] }, ] @@ -555,7 +555,7 @@ if conf.has('WITH_VMX') ] endif =20 -if conf.has('WITH_YAJL') +if conf.has('WITH_JSON') tests +=3D [ { 'name': 'virjsontest' }, { 'name': 'virmacmaptest' }, diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 74c20479d4..1a5c5f32e1 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -26,7 +26,7 @@ =20 #define VIR_FROM_THIS VIR_FROM_RPC =20 -#if !defined(WIN32) && defined(WITH_YAJL) +#if !defined(WIN32) && defined(WITH_JSON) struct testClientPriv { int magic; }; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index d07a05d04b..75d04e8030 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -815,7 +815,7 @@ mymain(void) " \= n" "\n", 1); =20 -#ifdef WITH_YAJL +#ifdef WITH_JSON TEST_BACKING_PARSE("json:", NULL); TEST_BACKING_PARSE("json:asdgsdfg", NULL); TEST_BACKING_PARSE("json:{}", NULL); @@ -1192,7 +1192,7 @@ mymain(void) "
\n" "\n"); =20 -#endif /* WITH_YAJL */ +#endif /* WITH_JSON */ =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.46.0