[PATCH 4/6] docs/newapi.xsl: Take API flag data from libvirt-api.xml rather than access/libvirt-access.xml

Peter Krempa pkrempa at redhat.com
Tue Feb 21 15:47:35 UTC 2023


Since now we embed the data in the libvirt API we don't need to source
it from the extra document.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 docs/newapi.xsl | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/docs/newapi.xsl b/docs/newapi.xsl
index cc3ec681b7..cc08b8460a 100644
--- a/docs/newapi.xsl
+++ b/docs/newapi.xsl
@@ -24,22 +24,14 @@

   <xsl:param name="indexfile" select="''"/>

-  <xsl:param name="aclxmlpath" select="''"/>
-
   <!-- the target directory for the HTML output -->
   <xsl:variable name="htmldir">html</xsl:variable>
   <xsl:variable name="href_base">../</xsl:variable>

-  <xsl:variable name="acls">
-    <xsl:if test="$aclxmlpath != ''">
-      <xsl:copy-of select="document($aclxmlpath)/aclinfo/api"/>
-    </xsl:if>
-  </xsl:variable>
-
   <xsl:template name="aclinfo">
-    <xsl:param name="api"/>
+    <xsl:param name="acl"/>

-    <xsl:if test="count(exsl:node-set($acls)/api[@name=$api]/check) > 0">
+    <xsl:if test="count($acl/check) > 0">
       <h5>Access control parameter checks</h5>
       <table>
         <thead>
@@ -49,10 +41,10 @@
             <th>Condition</th>
           </tr>
         </thead>
-        <xsl:apply-templates select="exsl:node-set($acls)/api[@name=$api]/check" mode="acl"/>
+        <xsl:apply-templates select="$acl/check" mode="acl"/>
       </table>
     </xsl:if>
-    <xsl:if test="count(exsl:node-set($acls)/api[@name=$api]/filter) > 0">
+    <xsl:if test="count($acl/filter) > 0">
       <h5>Access control return value filters</h5>
       <table>
         <thead>
@@ -61,7 +53,7 @@
             <th>Permission</th>
           </tr>
         </thead>
-        <xsl:apply-templates select="exsl:node-set($acls)/api[@name=$api]/filter" mode="acl"/>
+        <xsl:apply-templates select="$acl/filter" mode="acl"/>
       </table>
     </xsl:if>
   </xsl:template>
@@ -692,7 +684,7 @@
     </xsl:if>
     <div class="acl">
       <xsl:call-template name="aclinfo">
-        <xsl:with-param name="api" select="$name"/>
+        <xsl:with-param name="acl" select="acls"/>
       </xsl:call-template>
     </div>
   </xsl:template>
-- 
2.39.2



More information about the libvir-list mailing list