From nobody Mon Feb 2 07:25:27 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; 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1768576872; cv=none; d=zohomail.com; s=zohoarc; b=kLGiDWIz0qIf4fHpEHWczDrCH0S1AXy7CHz/q9S1ETh/ARdgzxnQpPAMxd62zkIby6F1f6B6V3Ag1+pBqPrhzmsIed+5WJgsaDbrg0o0Sn9dlSqagGKhtuioHXTLTck/hM5Gygq4pHxh3IxjdpJXCXB+YbnD4Pzxc8i7JPawHjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768576872; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=D3A0WqJaWn084BiGYi/ZLNC0zw+FD5wZbIe/89KZb54=; b=UqDLbO8RU5gYXZgnkit0op9WLnFvEHfpZD8ZmSgGDBvjogc+dr0qPUoFlc74lLVzo+NEMz5Q5jxC2hDeKv7ZVNMxzngVV2aS7dHL+U5att+yJDOfKNpbf2xlOYezOaQ1rwMxIyQDeSmFI0H5kGJEhUMd/iIG6Gm5xXWsOhyjdRc= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1768576872854791.5114771049351; Fri, 16 Jan 2026 07:21:12 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 9850641BDA; Fri, 16 Jan 2026 10:21:10 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7B38C41C7D; Fri, 16 Jan 2026 10:20:30 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id AAA09418AB; Fri, 16 Jan 2026 10:20:24 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 281C43F330 for ; Fri, 16 Jan 2026 10:20:24 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-497-iuP5TMG_NGuBpROvSRITFQ-1; Fri, 16 Jan 2026 10:20:22 -0500 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 582C218002CD for ; Fri, 16 Jan 2026 15:20:21 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.135]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7C4673001DB9; Fri, 16 Jan 2026 15:20:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768576823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D3A0WqJaWn084BiGYi/ZLNC0zw+FD5wZbIe/89KZb54=; b=CMcjy0elb0rbbmkJZLHMw48CwEnAdhgGXq4DvOb/8c3uyRLHxNHmjzUahTEkubZaWuG2B7 RYwzHhf8AyM1uxv5bY8SDfNa6mXXiVGiCIbCDU31Vr5f4na9VGDa1o7raLl4Sk8daiXD5w re1wx3xuFg9oNF1r48+QcGvvaHWs0Ug= X-MC-Unique: iuP5TMG_NGuBpROvSRITFQ-1 X-Mimecast-MFC-AGG-ID: iuP5TMG_NGuBpROvSRITFQ_1768576821 To: devel@lists.libvirt.org Subject: [PATCH 1/3] src: remove some -D defines from compiler args Date: Fri, 16 Jan 2026 15:20:15 +0000 Message-ID: <20260116152017.1165526-2-berrange@redhat.com> In-Reply-To: <20260116152017.1165526-1-berrange@redhat.com> References: <20260116152017.1165526-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: I-fcVOV7kk_FeYyWWA17IMBswOELMZvYRDrxS_uyIdg_1768576821 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OQXQGRMBPBQDYN5SSNHO5FQXQEMWNRBG X-Message-ID-Hash: OQXQGRMBPBQDYN5SSNHO5FQXQEMWNRBG X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1768576877580158500 From: Daniel P. Berrang=C3=A9 The compiler args are so verbose that CI jobs hit the limit on the log file size GitLab is willing to capture. Mitigate this a little bit by removing -DIN_LIBVIRT -Dabs_top_builddir=3D"..dir.." -Dabs_top_srcdir=3D"..dir.." The last two are already present in the meson-config.h file so were redundant, and the first is easily added to internal.h. NB, remote_protocol.x needed special treatment since it is an exception which (intentionally) does NOT include internal.h before libvirt/libvirt.h Signed-off-by: Daniel P. Berrang=C3=A9 --- src/internal.h | 2 ++ src/meson.build | 6 +----- src/remote/remote_protocol.x | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/internal.h b/src/internal.h index 8200480394..df311551a4 100644 --- a/src/internal.h +++ b/src/internal.h @@ -29,6 +29,8 @@ #include #include "glibcompat.h" =20 +#define IN_LIBVIRT + #if defined __clang_analyzer__ || defined __COVERITY__ # define STATIC_ANALYSIS 1 #endif diff --git a/src/meson.build b/src/meson.build index 47c978cc1f..16875622f4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,11 +1,7 @@ src_inc_dir =3D include_directories('.') =20 src_dep =3D declare_dependency( - compile_args: [ - '-DIN_LIBVIRT', - '-Dabs_top_builddir=3D"@0@"'.format(meson.project_build_root()), - '-Dabs_top_srcdir=3D"@0@"'.format(meson.project_source_root()), - ] + coverage_flags + win32_flags, + compile_args: coverage_flags + win32_flags, dependencies: [ glib_dep, libxml_dep, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 3c93203210..38a83c64ea 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -34,6 +34,7 @@ * 'REMOTE_'. This makes names quite long. */ =20 +%#define IN_LIBVIRT %#include %#include "internal.h" %#include "virxdrdefs.h" --=20 2.52.0