From nobody Sun Feb 8 12:14:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594894758; cv=none; d=zohomail.com; s=zohoarc; b=f8BlD6YDe30oGcpBujbGLHWZ/d/5V4Q/+wme2kR6zQ3QAg5cBaj1jTH2FJGzoxRWViVWaepxLTydLi95M97VwDx+sohRElkogZvO5/pJnTSaSWIeMIOCgSRifvCNMJet0CaAT03NQDPEWe0BCITJvpRgdry6njZ16GmpAKqGvBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894758; 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=OG07LNo00Zg1thEf59YTmpnsabp1sSnli/QX2ZPahos=; b=D+7Dt02DbHT0m9hiwSc2pcss6rvLZsWP3rdNPtUFrhdyZxjP8ogqKo1MDTUKBlgWsssAqSlrO04mNfNAfId5OVS9ZXDe7DjZe2StlM6b5axJRzDzhHCGnh0AH+pOG3xqqtePc+4X7my71paWpwbxVRpH90CS0rLUkjmAChxqUFk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894758346485.4179582079255; Thu, 16 Jul 2020 03:19:18 -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-95-MHlIqzNRNKySTTB6lN5HHg-1; Thu, 16 Jul 2020 06:09:22 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05C53100AA29; Thu, 16 Jul 2020 10:09:17 +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 DA0367B41F; Thu, 16 Jul 2020 10:09:16 +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 AACBF9A31E; Thu, 16 Jul 2020 10:09:16 +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 06GA5Epq018308 for ; Thu, 16 Jul 2020 06:05:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73B582DE72; Thu, 16 Jul 2020 10:05:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E20CD2DE6F for ; Thu, 16 Jul 2020 10:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894757; 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=OG07LNo00Zg1thEf59YTmpnsabp1sSnli/QX2ZPahos=; b=AZF1JvKHSLk21OQx6Qj++X6bQ3dEHpob+M+31uFh/c8vCU83D996ow7Kmjqm/w4bDUx7w8 Svg81vgNQE8UJxcinhkOpIFNLo/Se9mG2cQ7dBCBN3rnHUbi5isACapIQCV2aIRCp58WK9 M9sOLe4pZaj0Ulvn5KV95y4PfYZb4sw= X-MC-Unique: MHlIqzNRNKySTTB6lN5HHg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 201/351] meson: src: build virtlockd daemon binary Date: Thu, 16 Jul 2020 11:57:17 +0200 Message-Id: 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.13 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" Signed-off-by: Pavel Hrdina --- src/locking/Makefile.inc.am | 55 ------------------------------------- src/locking/meson.build | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+), 55 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 49cf0252162..20974dd0461 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -3,19 +3,6 @@ LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ locking/sanlock_helper.c =20 -LOCK_DAEMON_GENERATED =3D \ - locking/lock_daemon_dispatch_stubs.h - $(NULL) - -LOCK_DAEMON_SOURCES =3D \ - locking/lock_daemon.h \ - locking/lock_daemon.c \ - locking/lock_daemon_config.h \ - locking/lock_daemon_config.c \ - locking/lock_daemon_dispatch.c \ - locking/lock_daemon_dispatch.h \ - $(NULL) - RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 @@ -47,42 +34,6 @@ if WITH_LIBXL nodist_conf_DATA +=3D locking/libxl-lockd.conf endif WITH_LIBXL =20 -sbin_PROGRAMS +=3D virtlockd - -virtlockd_SOURCES =3D \ - $(LOCK_DAEMON_SOURCES) \ - $(NULL) -nodist_virtlockd_SOURCES =3D \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) -virtlockd_CFLAGS =3D \ - -I$(srcdir)/locking \ - -I$(builddir)/locking \ - -I$(builddir)/rpc \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -virtlockd_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(XDR_LIBS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -virtlockd_LDADD =3D \ - libvirt.la \ - libvirt_driver_admin.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -virtlockd_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -if WITH_SASL -virtlockd_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - if WITH_SANLOCK augeas_DATA +=3D locking/libvirt_sanlock.aug =20 @@ -169,12 +120,6 @@ locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf cp $< $@ =20 =20 -locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ - $(srcdir)/rpc/gendispatch.pl Makefile.am - $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \ - $(LOCK_PROTOCOL) > locking/lock_daemon_dispatch_stubs.h - virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 diff --git a/src/locking/meson.build b/src/locking/meson.build index 4767ee9c869..cdd558779c2 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -30,6 +30,23 @@ lock_protocol_generated +=3D custom_target( ], ) =20 +lock_daemon_sources =3D files( + 'lock_daemon.c', + 'lock_daemon_config.c', + 'lock_daemon_dispatch.c', +) + +lock_daemon_generated =3D custom_target( + 'lock_daemon_dispatch_stubs.h', + input: lock_protocol, + output: 'lock_daemon_dispatch_stubs.h', + command: [ + gendispatch_prog, '--mode=3Dserver', + 'virLockSpaceProtocol', 'VIR_LOCK_SPACE_PROTOCOL', '@INPUT@', + ], + capture: true, +) + sanlock_sources =3D [ 'lock_driver_sanlock.c', ] @@ -100,4 +117,16 @@ if conf.has('WITH_LIBVIRTD') 'install_dir': lockdriver_dir, } endif + + virt_daemons +=3D { + 'name': 'virtlockd', + 'sources': [ + lock_daemon_sources, + lock_daemon_generated, + lock_protocol_generated, + ], + 'include': [ + include_directories('.'), + ], + } endif --=20 2.26.2