From nobody Mon Feb 9 09:15:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1676994491; cv=none; d=zohomail.com; s=zohoarc; b=bHd2blWrp5XoO1mZ23eOGkUdkRsnL28v4sUF6vXFjQMbecncj+aZxJ2o0vD0CICOJrn0VswJ1vKaGUD1xUyuNfSaF2a0j5RRi+KF7sJ31curGEpGrMc5T4oFhHNli5CM/NUReO9MWi5HQrfd1qKEq+3SsD8xAf0bpmYj/fif/Xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676994491; 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=+TmC25ciPXQNHK9HeFFs6ONjU799hTYLdhRByuVyXMQ=; b=HAWc4FHvGgVjbVcef+/N1qPrrI5I4wrJlulQrjR5y+tq86WtYbNS8xr07eB6lZQ6Q2glH3cVRwA0PrMZGo18WIqu/9tTD3E9pZRgf04P5ZvgQ3z1h9MT6PbMnWh/4Ee9+A0aaGabFV3K5prEeF63A6wvY5xcGYqgAVShpQHl9FQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 167699449165933.96090828394324; Tue, 21 Feb 2023 07:48:11 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-568-Kn5NKcVFO72vp_KRqUbuRA-1; Tue, 21 Feb 2023 10:48:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23B87101A52E; Tue, 21 Feb 2023 15:47:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0484D40168BA; Tue, 21 Feb 2023 15:47:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 852841949753; Tue, 21 Feb 2023 15:47:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3A77019451F8 for ; Tue, 21 Feb 2023 15:47:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2C3D0492B01; Tue, 21 Feb 2023 15:47:43 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2BF3492B00 for ; Tue, 21 Feb 2023 15:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676994490; 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=+TmC25ciPXQNHK9HeFFs6ONjU799hTYLdhRByuVyXMQ=; b=a5T4hZFl1rQQB6Ibj2NuqwRQSg6cPDo5Y4QiQTu+EqUfRGeubmYdWenSxfKb4/Jiwh28X8 eQ2uIONJszaqlsv4VRtThZDrkN4qfYGWbhnQj5MXbuuPXudGj1T+LtjduZHkGfnnf6prOm E0aLhpaCBftMK3AbFoXXdjpsW6L0wEk= X-MC-Unique: Kn5NKcVFO72vp_KRqUbuRA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/6] docs|access: Don't build the ACL flags into a separate XML Date: Tue, 21 Feb 2023 16:47:36 +0100 Message-Id: <2d64f3a28c9c980bf6f8cbb37a66aa356f0ed395.1676994420.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1676994493216100007 Content-Type: text/plain; charset="utf-8" Since we now build it into the libvirt-api.xml or equivalents we don't need the extra XML files. Signed-off-by: Peter Krempa --- docs/html/meson.build | 32 +------------------------------- src/access/meson.build | 16 ---------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/docs/html/meson.build b/docs/html/meson.build index 4e818f9142..b18a8ccb5f 100644 --- a/docs/html/meson.build +++ b/docs/html/meson.build @@ -27,14 +27,12 @@ index_api_gen =3D custom_target( command: [ xsltproc_prog, '--nonet', '-o', docs_builddir, '--stringparam', 'builddir', meson.project_build_root(), - '--stringparam', 'aclxmlpath', docs_acl_xml.full_path(), '--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'indexfile', 'index.html', '@INPUT@', ], install: true, install_dir: docs_html_dir / 'html', - depends: docs_acl_xml, depend_files: [ page_xsl, ], @@ -43,7 +41,7 @@ index_api_gen =3D custom_target( docs_html_gen +=3D index_api_gen.to_list() docs_html_dep +=3D index_api_gen -foreach name : [ 'lxc', 'qemu' ] +foreach name : [ 'admin', 'lxc', 'qemu' ] index_api_gen =3D custom_target( 'index-@0@-api'.format(name), input: [ @@ -56,13 +54,11 @@ foreach name : [ 'lxc', 'qemu' ] command: [ xsltproc_prog, '--nonet', '-o', docs_builddir, '--stringparam', 'builddir', meson.project_build_root(), - '--stringparam', 'aclxmlpath', get_variable('docs_acl_@0@_xml'.forma= t(name)).full_path(), '--stringparam', 'timestamp', docs_timestamp, '@INPUT@', ], install: true, install_dir: docs_html_dir / 'html', - depends: get_variable('docs_acl_@0@_xml'.format(name)), depend_files: [ page_xsl, ], @@ -72,32 +68,6 @@ foreach name : [ 'lxc', 'qemu' ] docs_html_dep +=3D index_api_gen endforeach -index_api_gen =3D custom_target( - 'index-admin-api'.format(name), - input: [ - newapi_xsl, - docs_admin_api_xml, - ], - output: [ - 'libvirt-libvirt-admin.html' - ], - command: [ - xsltproc_prog, '--nonet', '-o', docs_builddir, - '--stringparam', 'builddir', meson.project_build_root(), - '--stringparam', 'aclxmlpath', '', - '--stringparam', 'timestamp', docs_timestamp, - '@INPUT@', - ], - install: true, - install_dir: docs_html_dir / 'html', - depend_files: [ - page_xsl, - ], - ) - -docs_html_gen +=3D index_api_gen.to_list() -docs_html_dep +=3D index_api_gen - docs_html_paths =3D [] install_web_deps +=3D docs_html_dep diff --git a/src/access/meson.build b/src/access/meson.build index 0b12581dc1..07c703e8b5 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -23,12 +23,10 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] 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) @@ -62,22 +60,8 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] gendispatch_prog, '--mode=3Daclsym', name, name.to_upper(), '@INPUT@= ', ] ) - - access_gen_xml +=3D custom_target( - xml_file, - input: protocol_file, - output: xml_file, - capture: true, - command: [ - gendispatch_prog, '--mode=3Daclapi', name, name.to_upper(), '@INPUT@= ', - ], - ) endforeach -docs_acl_xml =3D access_gen_xml[0] -docs_acl_qemu_xml =3D access_gen_xml[1] -docs_acl_lxc_xml =3D access_gen_xml[2] - if conf.has('WITH_POLKIT') access_sources +=3D access_polkit_sources --=20 2.39.2