From nobody Mon Feb 9 01:06:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1594894184; cv=none; d=zohomail.com; s=zohoarc; b=BRLxUHUE2DZgHKnNzvbAFogzDgRfifOz1LsKzQu7pcxsNbYt+0btaleoQho9WR9zXxoZWAD/O6WIYQUujHmBCx/eukWQm5p/plojrtwDCTYv8GRYgLVnIjvjl3gkFbtkvFz/wkes3QDeWnRsjXGTwH7BSzTu8+opB7+hh8khdfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894184; 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=qI0ZHs9bMfT7M903xePrj4ysDGJrTFi10jTiauOt9LA=; b=izpRXkNb37b1GB163tF7Pps7SMAmmlwG3Qfyh4jQOXabLoTH4YJtpTLkPShRS+Of6kGHsmhQkTaJKu59nZ9gJFfZqiW/jTQ4AKyABKyPT38ECfcRnNJ/V8Jm68+TKSUG3+uo1mZrQ4uv195AbSdNYSbo/ICH4udarxHatDlv2qA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894184149504.8729406663663; Thu, 16 Jul 2020 03:09:44 -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-198-E1x6YfFFNm-OXTjtMJ_igw-1; Thu, 16 Jul 2020 06:09:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F7FD10059C7; Thu, 16 Jul 2020 10:09:34 +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 1E0A96FEF9; Thu, 16 Jul 2020 10:09:34 +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 E2AED9A337; Thu, 16 Jul 2020 10:09:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA5VAp018511 for ; Thu, 16 Jul 2020 06:05:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id B84D42B6DC; Thu, 16 Jul 2020 10:05:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 329AA2B6DB for ; Thu, 16 Jul 2020 10:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894183; 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=qI0ZHs9bMfT7M903xePrj4ysDGJrTFi10jTiauOt9LA=; b=Ox/HOBXvvzUMzHCovRkN33znAx3k5J6LPE6p996v8hDze5x69egdbWWRmp5W8PxZIGqAY3 j2JYg2ZiDfsYMGIdwtDyJleubNaXIpzbQksuNXGyaMyVY2LG2n5+B1c7ouEk/mD7M/LuqQ 7Q/eSJ5WpyYdKscn5Ah13tybyZK6104= X-MC-Unique: E1x6YfFFNm-OXTjtMJ_igw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 215/351] meson: src: build libvirt_sanlock_helper binary Date: Thu, 16 Jul 2020 11:57:31 +0200 Message-Id: <0c70e51de9a9244373809463250da1e32c0d6433.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.12 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" Signed-off-by: Pavel Hrdina --- src/locking/Makefile.inc.am | 17 ----------------- src/locking/meson.build | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 20974dd0461..b4fb9387a17 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,8 +1,5 @@ # vim: filetype=3Dautomake =20 -LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ - locking/sanlock_helper.c - RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 @@ -46,20 +43,6 @@ if WITH_LIBXL nodist_conf_DATA +=3D locking/libxl-sanlock.conf endif WITH_LIBXL =20 -libexec_PROGRAMS +=3D libvirt_sanlock_helper - -libvirt_sanlock_helper_SOURCES =3D $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) -libvirt_sanlock_helper_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) endif WITH_SANLOCK =20 conf_DATA +=3D locking/virtlockd.conf diff --git a/src/locking/meson.build b/src/locking/meson.build index cdd558779c2..0e48c86afc9 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -51,6 +51,10 @@ sanlock_sources =3D [ 'lock_driver_sanlock.c', ] =20 +sanlock_helper_sources =3D files( + 'sanlock_helper.c', +) + lock_driver_lib =3D static_library( 'virt_lock_driver', [ @@ -129,4 +133,16 @@ if conf.has('WITH_LIBVIRTD') include_directories('.'), ], } + + if conf.has('WITH_SANLOCK') + virt_helpers +=3D { + 'name': 'libvirt_sanlock_helper', + 'sources': [ + sanlock_helper_sources, + ], + 'include': [ + conf_inc_dir, + ], + } + endif endif --=20 2.26.2