From nobody Sun Feb 8 15:25:18 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=1594894423; cv=none; d=zohomail.com; s=zohoarc; b=HTH7jkFcclMN6Uiv4WfgoOOVwHIsN9+xgXY/03UWP1UWy6Yanh4JDSIeOdVDfQ19/elnTdehyi4WafSbinR3ycAoeX2HVAUakcqIvN7xtPSAef5tTaV1vhXtEiXhgDmKnRb87adpmhWodapNzRhSficjRn5WnE6QKDT7gR0BssM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894423; 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=RtNLZxS8HPZC0SkDX1vqmji1/lIGtxZX79hN1Bre5r0=; b=A7BD79qGHnMahgA504nMdLBq7aV4u7ErBJyujtowLkp4sqhuTHnz2Wic8GMXzHvEKiOZBa1pBANBnatw0BVHWT1bD4YLvfDKCJUGZ188/5WDttCyOVZm0XEN+L6BjWWDmQYdwM2U+5OCyd0w/LrBcSJodGG7p54qJXL5opnxIbU= 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 1594894423158301.60967802696587; Thu, 16 Jul 2020 03:13: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-24-SXUS8fRYP1S8Vpetx_x0Qg-1; Thu, 16 Jul 2020 06:13:39 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49D4B100AA24; Thu, 16 Jul 2020 10:13:34 +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 2C1E472ADB; Thu, 16 Jul 2020 10:13: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 EFA2E18034F3; Thu, 16 Jul 2020 10:13: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 06GA5nG5018711 for ; Thu, 16 Jul 2020 06:05:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id E88712B6DC; Thu, 16 Jul 2020 10:05:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61CDD2B6DB for ; Thu, 16 Jul 2020 10:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894421; 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=RtNLZxS8HPZC0SkDX1vqmji1/lIGtxZX79hN1Bre5r0=; b=K9y27dP1cmyYSHty0eDzbZmAvq6ReNZ16uQtFxjaJhuCCfM3mbLDfJdgYDwE7xQyTedegy W89d7HJbdEP+Wn8KUeej2H/Bo6GtkyfZoJ3/2sVAophhoXLAl7iOhK6dkN8BYlj/1ylQrm XUVHcRkzkZYarXPo+g1FjVxq5lT/Ud0= X-MC-Unique: SXUS8fRYP1S8Vpetx_x0Qg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 232/351] meson: src/access: generate libvirt_access*.xml files Date: Thu, 16 Jul 2020 11:57:48 +0200 Message-Id: <68d201eb7a9001702a51d7db6e11c3e59adc24e9.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.15 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/Makefile.am | 1 - src/access/Makefile.inc.am | 21 --------------------- src/access/meson.build | 12 ++++++++++++ 3 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 src/access/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 07516aa43ae..63705b36b6f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,6 @@ endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D =20 include security/Makefile.inc.am -include access/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am include vbox/Makefile.inc.am diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am deleted file mode 100644 index d90829632ff..00000000000 --- a/src/access/Makefile.inc.am +++ /dev/null @@ -1,21 +0,0 @@ -# vim: filetype=3Dautomake - -ACCESS_DRIVER_API_FILES =3D \ - libvirt_access.xml \ - libvirt_access_qemu.xml \ - libvirt_access_lxc.xml \ - $(NULL) - -libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - lxc LXC $(LXC_PROTOCOL) > $@ - diff --git a/src/access/meson.build b/src/access/meson.build index 71bc4670091..2d8a2a90716 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -16,16 +16,19 @@ remote_path =3D meson.source_root() / 'src' / 'remote' access_gen_headers =3D [] access_gen_sources =3D [] access_gen_sym =3D [] +access_gen_xml =3D [] =20 foreach name : [ 'remote', 'qemu', 'lxc' ] if name =3D=3D 'remote' header_file =3D 'viraccessapicheck.h' source_file =3D 'viraccessapicheck.c' syms_file =3D 'libvirt_access.syms' + xml_file =3D 'libvirt_access.xml' else header_file =3D 'viraccessapicheck@0@.h'.format(name) source_file =3D 'viraccessapicheck@0@.c'.format(name) syms_file =3D 'libvirt_access_@0@.syms'.format(name) + xml_file =3D 'libvirt_access_@0@.xml'.format(name) endif protocol_file =3D remote_path / '@0@_protocol.x'.format(name) =20 @@ -56,6 +59,15 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] gendispatch_prog, '--mode=3Daclsym', name, name.to_upper(), protocol= _file, ] ) + + access_gen_xml +=3D custom_target( + xml_file, + output: xml_file, + capture: true, + command: [ + gendispatch_prog, '--mode=3Daclapi', name, name.to_upper(), protocol= _file, + ], + ) endforeach =20 if conf.has('WITH_POLKIT') --=20 2.26.2