From nobody Sun Feb 8 12:31:36 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=1594894063; cv=none; d=zohomail.com; s=zohoarc; b=cbhSZwt9YPnMoJ3m/xdQrAnN3l7lArBb3tGm8EkkSGuTElbKixkp3xg4EPxhZTuOx5fTB81wpJ9wv/lSGUPLVJqYAENuC53RCf7VFs+EYhTr4eAXW4YxAls9h2JW2kjMP3a9iHUwkgJdCF6tUDeiuZ+jUInF32LRiZo8tn08hL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894063; 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=IkgHINqi0MJBTgMAyuF2SvkFCsTikDvGXBVDJA0r7v4=; b=SO0IaRKm9BJ6tdxKiD0AJQxO48ZPhZWB0tXQ3UWHYceU294wuSbcnewsDNXua1owmBexb1yjXCr1u8A3CseEzZPL+2lYA01P0udlU/oimNMusT9WptdH4ivMfXeaIgpBpJEKNhZwN+tmWInOhO8LDzFKHCxCT6ksaScELi/7vAg= 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 1594894063934769.5881195636805; Thu, 16 Jul 2020 03:07:43 -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-494-Tzu7bIgvPcK5O9Tb6XlKrw-1; Thu, 16 Jul 2020 06:07:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5ED62100AA27; Thu, 16 Jul 2020 10:07: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 3EDF779504; Thu, 16 Jul 2020 10:07: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 0E12196245; Thu, 16 Jul 2020 10:07:34 +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 06GA3m8W017453 for ; Thu, 16 Jul 2020 06:03:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6F5BD2DE69; Thu, 16 Jul 2020 10:03:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE5522B6DB for ; Thu, 16 Jul 2020 10:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894062; 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=IkgHINqi0MJBTgMAyuF2SvkFCsTikDvGXBVDJA0r7v4=; b=QBVx4GBJmYZOkkdrA2wjLGqW/aZkBGxI+Wy2ZFKbMHZi2sRvldvhacJImf3Xcm1lcLpRDA a69vzbdIR1cegk40BMV1UBCJz2uffwaSaI5yMfza6OWqSONc4Ed/4XpGvW3Xa1MwRGRg0A L14GU5JgDf1Nz+NT3YEOom8WVbhmr18= X-MC-Unique: Tzu7bIgvPcK5O9Tb6XlKrw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 143/351] meson: src: build libvirt_driver_lock.a static library Date: Thu, 16 Jul 2020 11:56:19 +0200 Message-Id: <29226edcdd9fba9fccbce9cf370e80f5a7468341.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.14 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 | 21 --------------------- src/locking/meson.build | 18 ++++++++++++++++++ src/meson.build | 1 + 3 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 src/locking/meson.build diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index b75588f9fce..3afc9803ce0 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,15 +1,5 @@ # vim: filetype=3Dautomake =20 -LOCK_DRIVER_SOURCES =3D \ - locking/lock_manager.c \ - locking/lock_manager.h \ - locking/lock_driver.h \ - locking/lock_driver_nop.h \ - locking/lock_driver_nop.c \ - locking/domain_lock.h \ - locking/domain_lock.c \ - $(NULL) - LOCK_DRIVER_SANLOCK_SOURCES =3D \ locking/lock_driver_sanlock.c =20 @@ -60,17 +50,6 @@ OPENRC_INIT_FILES_IN +=3D \ locking/virtlockd.init.in \ $(NULL) =20 -noinst_LTLIBRARIES +=3D libvirt_driver_lock.la - -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_lock.la -libvirt_driver_lock_la_SOURCES =3D \ - $(LOCK_DRIVER_SOURCES) \ - $(NULL) -libvirt_driver_lock_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(srcdir)/conf \ - $(NULL) - lockdriverdir =3D $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES =3D =20 diff --git a/src/locking/meson.build b/src/locking/meson.build new file mode 100644 index 00000000000..67822486253 --- /dev/null +++ b/src/locking/meson.build @@ -0,0 +1,18 @@ +lock_driver_sources =3D [ + 'lock_manager.c', + 'lock_driver_nop.c', + 'domain_lock.c', +] + +lock_driver_lib =3D static_library( + 'virt_lock_driver', + [ + lock_driver_sources, + ], + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], +) diff --git a/src/meson.build b/src/meson.build index af9dcfbb5f5..96e49f2059c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -87,6 +87,7 @@ subdir('hypervisor') subdir('vmx') =20 subdir('admin') +subdir('locking') =20 subdir('esx') subdir('hyperv') --=20 2.26.2