From nobody Mon Feb 9 05:41:27 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=1594894516; cv=none; d=zohomail.com; s=zohoarc; b=JR1FGqFooXrjJeoOsPg2EqlDlJc/Y/7Y4viFCXYjP6CRAUNN84zi1kz7x/5y7zfXdhsUdVppGjWsGRW9QMaSV/6Xj1e32BfQS3VPndDDisf1wN+F9xI0ddH1mdu3m6TZbwnJtDhJtnpW4HioHbsgn5aU4LKrYS655UTllqYqtxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894516; 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=bYz/dr1xmXYLwNoPRi61NNpIKyFRhfjcTdzXvsGkvJs=; b=KQ2BAzjD7uQubUP7BO4NjvoPgBbOsQfNKmBdTB53B2WXTcmHKudIsL8JwBjFeCWsJCf8bfb/p+4+EAyRf/ZNkLkfFH1Ah1vH9xWXOGXQCH5HLgtfIWJOAKEsFv8LSSb4DZM8OyGdHj5EWQl6T7FulwgF41HSOk2mvtcgEOnosFA= 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 1594894516092543.865535325114; Thu, 16 Jul 2020 03:15:16 -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-488-_EE5sO5xMue6vBNz7or9Cw-1; Thu, 16 Jul 2020 06:08:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 757BE801E6A; Thu, 16 Jul 2020 10:08:07 +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 5108D2DE72; Thu, 16 Jul 2020 10:08:07 +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 1BA50104903; Thu, 16 Jul 2020 10:08:07 +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 06GA58Kl018256 for ; Thu, 16 Jul 2020 06:05:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04C972B6E6; Thu, 16 Jul 2020 10:05:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F5172DE9D for ; Thu, 16 Jul 2020 10:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894514; 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=bYz/dr1xmXYLwNoPRi61NNpIKyFRhfjcTdzXvsGkvJs=; b=CBAxFokqcE7BcIhzoLAC9mfZi8Xs+G29vgUQhlfydd6saydx1XJxTmtgVQczbQTXWWd3im cfAxBuE0oKee6viJu55LR0QIRuhAe5q3YzVtvvy7EIRAQ4XhOXjap+tSdVc6J+u1B5WmqX +5SttnhV5U0d/AZIBjQm1mxOCd5pw/g= X-MC-Unique: _EE5sO5xMue6vBNz7or9Cw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 196/351] meson: src: prepare sources for libvirt daemons Date: Thu, 16 Jul 2020 11:57:12 +0200 Message-Id: <64ab2a07ab4d5cf38432b0c0688f76ea6ff9ea79.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.84 on 10.5.11.23 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/remote/Makefile.inc.am | 45 -------------------------------------- src/remote/meson.build | 24 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 45 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 421f7337217..9866903847e 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -1,22 +1,5 @@ # vim: filetype=3Dautomake =20 -REMOTE_DAEMON_GENERATED =3D \ - remote/remote_daemon_dispatch_stubs.h \ - remote/lxc_daemon_dispatch_stubs.h \ - remote/qemu_daemon_dispatch_stubs.h \ - $(NULL) - -REMOTE_DAEMON_SOURCES =3D \ - remote/remote_daemon.c \ - remote/remote_daemon.h \ - remote/remote_daemon_config.c \ - remote/remote_daemon_config.h \ - remote/remote_daemon_dispatch.c \ - remote/remote_daemon_dispatch.h \ - remote/remote_daemon_stream.c \ - remote/remote_daemon_stream.h \ - $(NULL) - REMOTE_DAEMON_CFLAGS =3D \ $(AM_CFLAGS) \ $(GNUTLS_CFLAGS) \ @@ -118,15 +101,6 @@ OPENRC_CONF_FILES +=3D \ remote/virtproxyd.confd \ $(NULL) =20 -REMOTE_PROTOCOL =3D $(srcdir)/remote/remote_protocol.x -LXC_PROTOCOL =3D $(srcdir)/remote/lxc_protocol.x -QEMU_PROTOCOL =3D $(srcdir)/remote/qemu_protocol.x -REMOTE_DRIVER_PROTOCOL =3D \ - $(REMOTE_PROTOCOL) \ - $(QEMU_PROTOCOL) \ - $(LXC_PROTOCOL) \ - $(NULL) - if WITH_LIBVIRTD =20 sbin_PROGRAMS +=3D libvirtd virtproxyd @@ -362,22 +336,3 @@ virtproxy%.socket: remote/libvirt%.socket.in $(top_bui= lddir)/config.status virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \ $(top_builddir)/config.status $(AM_V_GEN)cp $< $@ - - -remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=3Dserver remote REMOTE $(REMOTE_PROTOCOL) \ - > remote/remote_daemon_dispatch_stubs.h - -remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=3Dserver lxc LXC $(LXC_PROTOCOL) \ - > remote/lxc_daemon_dispatch_stubs.h - -remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=3Dserver qemu QEMU $(QEMU_PROTOCOL) \ - > remote/qemu_daemon_dispatch_stubs.h diff --git a/src/remote/meson.build b/src/remote/meson.build index 3de6c5ee1f4..1e3e3479c80 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -39,6 +39,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ) endforeach =20 +remote_daemon_sources =3D files( + 'remote_daemon.c', + 'remote_daemon_config.c', + 'remote_daemon_dispatch.c', + 'remote_daemon_stream.c', +) + +remote_daemon_generated =3D [] + +foreach name : [ 'remote', 'qemu', 'lxc' ] + protocol_x =3D '@0@_protocol.x'.format(name) + dispatch_h =3D '@0@_daemon_dispatch_stubs.h'.format(name) + + remote_daemon_generated +=3D custom_target( + dispatch_h, + input: protocol_x, + output: dispatch_h, + command: [ + gendispatch_prog, '--mode=3Dserver', name, name.to_upper(), '@INPUT@= ', + ], + capture: true, + ) +endforeach + if conf.has('WITH_REMOTE') remote_driver_lib =3D static_library( 'virt_remote_driver', --=20 2.26.2