From nobody Sun Feb 8 11:16:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894169; cv=none; d=zohomail.com; s=zohoarc; b=Ml7tSvJ9hXewKlafvVKOrMcBjMo4cPfzVJBW6607h6wMPWq8Ynz+v8DyXZWBag6TwCmBfBYZ4F+iEgbHD6CRq1XgIrJOvDD422Dltfv+ZPVWwehXJALgoUXSD1mxVnEGi3fQOgzH+nMeL/gdNGYMH+i6SkL299OW/B4NSCEVIm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894169; 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=AKK01e4Q+ytKIeFo8glOLfwxmTGPXgE5UfjO2mDX8rI=; b=Y4NV7M8pyysVFAfkppSqKDDJu1wj6C7UE6bc4vbN5ul8+93ixjMjtxDaadTYTegDYp0yZosKtqJUEVQTd4ze9HNKnDo6yVTiqtK6hlriurShXkmAWTDOCIQmNA6BYht1JA/GUmtRGo0bnaoCHDY2PLPdq5IPCbfw6tT21BKCLc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894169361802.4525303812004; Thu, 16 Jul 2020 03:09:29 -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-234-VEX16UxXMs-riQljL-JLzg-1; Thu, 16 Jul 2020 06:09:25 -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 36E0D107ACCA; Thu, 16 Jul 2020 10:09:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1771179500; Thu, 16 Jul 2020 10:09:19 +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 DC715181A76A; Thu, 16 Jul 2020 10:09:18 +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 06GA5FKq018313 for ; Thu, 16 Jul 2020 06:05:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5D8C22B6DB; Thu, 16 Jul 2020 10:05:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C96CF2DE8A for ; Thu, 16 Jul 2020 10:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894168; 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=AKK01e4Q+ytKIeFo8glOLfwxmTGPXgE5UfjO2mDX8rI=; b=K2ALnLNpAzJXhEI0sxAFRUwH3I2iAxzKdaFXrrx2UP5wwwiOokr7UhoV8D9MDNf6rW1TIz LZsgMYJ7ilCQ80O6BSeS1TH6bhP1JZh0efe7DBbVY0D8noPQUGqRiwE3dq3i0JFbKJxuuW vbQ0BHKEQFKGUHPGM0PKX4SHuWjI58s= X-MC-Unique: VEX16UxXMs-riQljL-JLzg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 202/351] meson: src: build virtlogd daemon binary Date: Thu, 16 Jul 2020 11:57:18 +0200 Message-Id: <538e03ce3f17e32a04db9128a7ac577ab63223ed.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/logging/Makefile.inc.am | 64 ------------------------------------- src/logging/meson.build | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 64 deletions(-) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index b88e0c8766e..8adec645d36 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -1,27 +1,5 @@ # vim: filetype=3Dautomake =20 -LOG_PROTOCOL_GENERATED =3D \ - logging/log_protocol.h \ - logging/log_protocol.c \ - $(NULL) - -LOG_DAEMON_GENERATED =3D \ - logging/log_daemon_dispatch_stubs.h - $(NULL) - -LOG_DAEMON_SOURCES =3D \ - logging/log_daemon.h \ - logging/log_daemon.c \ - logging/log_daemon_config.h \ - logging/log_daemon_config.c \ - logging/log_daemon_dispatch.c \ - logging/log_daemon_dispatch.h \ - logging/log_handler.c \ - logging/log_handler.h \ - $(NULL) - -LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x - SYSCONF_FILES +=3D logging/virtlogd.sysconf =20 VIRTLOGD_UNIT_FILES_IN =3D \ @@ -41,42 +19,6 @@ OPENRC_INIT_FILES_IN +=3D \ $(NULL) =20 if WITH_LIBVIRTD -sbin_PROGRAMS +=3D virtlogd - - -virtlogd_SOURCES =3D \ - $(LOG_DAEMON_SOURCES) \ - $(NULL) -nodist_virtlogd_SOURCES =3D \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ - $(NULL) -virtlogd_CFLAGS =3D \ - -I$(builddir)/logging \ - -I$(builddir)/rpc \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -virtlogd_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(XDR_LIBS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -virtlogd_LDADD =3D \ - libvirt_driver_admin.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -virtlogd_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -if WITH_SASL -virtlogd_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - conf_DATA +=3D logging/virtlogd.conf =20 augeas_DATA +=3D logging/virtlogd.aug @@ -88,12 +30,6 @@ logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \ =20 endif WITH_LIBVIRTD =20 -logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ - $(srcdir)/rpc/gendispatch.pl Makefile.am - $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \ - $(LOG_PROTOCOL) > logging/log_daemon_dispatch_stubs.h - virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 diff --git a/src/logging/meson.build b/src/logging/meson.build index 5d1f30ac08f..0e58bc9e6bd 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -24,6 +24,13 @@ log_protocol_generated +=3D custom_target( ], ) =20 +log_daemon_sources =3D files( + 'log_daemon.c', + 'log_daemon_config.c', + 'log_daemon_dispatch.c', + 'log_handler.c', +) + log_driver_lib =3D static_library( 'virt_log_driver', [ @@ -38,3 +45,28 @@ log_driver_lib =3D static_library( ) =20 libvirt_libs +=3D log_driver_lib + +if conf.has('WITH_LIBVIRTD') + log_daemon_generated =3D custom_target( + 'log_daemon_dispatch_stubs.h', + input: log_protocol, + output: 'log_daemon_dispatch_stubs.h', + command: [ + gendispatch_prog, '--mode=3Dserver', + 'virLogManagerProtocol', 'VIR_LOG_MANAGER_PROTOCOL', '@INPUT@', + ], + capture: true, + ) + + virt_daemons +=3D { + 'name': 'virtlogd', + 'sources': [ + log_daemon_sources, + log_daemon_generated, + log_protocol_generated, + ], + 'include': [ + include_directories('.'), + ], + } +endif --=20 2.26.2