From nobody Tue Oct 28 16:39:34 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1759749643; cv=none; d=zohomail.com; s=zohoarc; b=JE86agsuGun2im+xg04qqyHz/Rrzs/HlFxlcwgGc5M4wrNTURQw1S7J0SpEETdL7FC9zgDm+DaTVUSkAvZEGK49gSxq91Nsm2jnDzRza1KBXTp+PDzayYkQezh8ZNfKJ0rdYhcHGPx11X2Ehpb+QIbLCd3CAD763DVAvRSJgCIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759749643; 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=JXtGfurR4xqO+OzOgEVWh/fLEEUPyJHvG85RNMa8E8E=; b=WNVJjaEizQhT5+XEe6DzfaGpTe1ExdYDyoc8xwt6Ev5SDymVxMmcts1nyeY0W+UeePeM2akX8EUgrbR5C0ShHe1UV6gWmlP6J609WK+x/O/Xq9dAUDtgNDelN93P5IInQunoScytWcx6EtWkmN/2PHYRcsZYMCdidhLDek+MDuQ= 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 1759749643873905.4885001422348; Mon, 6 Oct 2025 04:20:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B271841A99; Mon, 6 Oct 2025 07:20:40 -0400 (EDT) Received: from [172.19.199.17] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 2999444176; Mon, 6 Oct 2025 07:18:17 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BF5A44409B; Mon, 6 Oct 2025 07:17:59 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 2FF7B43FD0 for ; Mon, 6 Oct 2025 07:17:48 -0400 (EDT) Received: from mx-prod-mc-06.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-614-VIpY-jNjPqy6CwZWroJNmg-1; Mon, 06 Oct 2025 07:17:46 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A776B1800577 for ; Mon, 6 Oct 2025 11:17:45 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.162]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 082821956056; Mon, 6 Oct 2025 11:17:42 +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.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, 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=1759749467; 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=JXtGfurR4xqO+OzOgEVWh/fLEEUPyJHvG85RNMa8E8E=; b=hYk+/CIsMdAYjRM4VybsAEKgDs5c2EJc9HxhntfthR0FIGzT9zxtjxCPVLYkPfSKIBe84k Dc0lokBC3aNKHeKJjplwjqAjKmq2gkalE+gTODLxDpS0OgrcyFhmmBhUK8Q+/hAonKDe+O cEtOVZBWf5RWpZSCzrkWkaUQiziTsw4= X-MC-Unique: VIpY-jNjPqy6CwZWroJNmg-1 X-Mimecast-MFC-AGG-ID: VIpY-jNjPqy6CwZWroJNmg_1759749465 To: devel@lists.libvirt.org Subject: [PATCH v2 2/2] locking: use & install test_libvirt_sanlock.sug for both QEMU & LibXL Date: Mon, 6 Oct 2025 12:17:32 +0100 Message-ID: <20251006111732.3661169-3-berrange@redhat.com> In-Reply-To: <20251006111732.3661169-1-berrange@redhat.com> References: <20251006111732.3661169-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VHjlkjb6uvS1I5LW3-54R4mzymu8opGIfVKKIpv5JKk_1759749465 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: A3SH7KIRUV3XOU5RPQI5NA4VUYY7IFCZ X-Message-ID-Hash: A3SH7KIRUV3XOU5RPQI5NA4VUYY7IFCZ 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: 1759749646316116600 From: Daniel P. Berrang=C3=A9 The RPM specfile was referencing test_libvirt_sanlock.aug in the common file list, for both QEMU and LibXL. This makes sense since the sanlock.conf file is cloned for both drivers. The libvirt_sanlock.aug file, however, was missing a reference to the LibXL copy of the config. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/locking/libvirt_sanlock.aug | 1 + src/locking/meson.build | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.= aug index 184ea1f181..62d0672952 100644 --- a/src/locking/libvirt_sanlock.aug +++ b/src/locking/libvirt_sanlock.aug @@ -33,6 +33,7 @@ module Libvirt_sanlock =3D let lns =3D ( record | comment | empty ) * =20 let filter =3D incl "/etc/libvirt/qemu-sanlock.conf" + . incl "/etc/libvirt/libxl-sanlock.conf" . Util.stdexcl =20 let xfm =3D transform lns filter diff --git a/src/locking/meson.build b/src/locking/meson.build index 934e47593b..f8d12c481f 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -207,6 +207,14 @@ if conf.has('WITH_LIBVIRTD') =20 if conf.has('WITH_SANLOCK') virt_aug_files +=3D files('libvirt_sanlock.aug') + virt_test_aug_files +=3D { + 'name': 'test_libvirt_sanlock.aug', + 'aug': files('test_libvirt_sanlock.aug.in'), + 'conf': files('sanlock.conf'), + 'test_name': 'libvirt_sanlock', + 'test_srcdir': meson.current_source_dir(), + 'test_builddir': meson.current_build_dir(), + } =20 if conf.has('WITH_QEMU') qemu_sanlock_conf =3D configure_file( @@ -215,14 +223,6 @@ if conf.has('WITH_LIBVIRTD') configuration: configmake_conf, ) virt_conf_files +=3D qemu_sanlock_conf - virt_test_aug_files +=3D { - 'name': 'test_libvirt_sanlock.aug', - 'aug': files('test_libvirt_sanlock.aug.in'), - 'conf': qemu_sanlock_conf, - 'test_name': 'libvirt_sanlock', - 'test_srcdir': meson.current_source_dir(), - 'test_builddir': meson.current_build_dir(), - } endif =20 if conf.has('WITH_LIBXL') --=20 2.50.1