render / rpms / libvirt

Forked from rpms/libvirt 7 months ago
Clone
2cf05b
From eb17cd2553366491b54c834b00fd953e94ef0bd2 Mon Sep 17 00:00:00 2001
2cf05b
Message-Id: <eb17cd2553366491b54c834b00fd953e94ef0bd2@dist-git>
2cf05b
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
2cf05b
Date: Fri, 13 May 2022 12:31:14 +0200
2cf05b
Subject: [PATCH] schemas: refactor out nodedev ccw address schema
2cf05b
2cf05b
Refactor out nodedev ccw address schema for easy reuse later.
2cf05b
2cf05b
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
2cf05b
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2cf05b
(cherry picked from commit e9ba2ced0b6bdcf6ed4c4b38d8f3fc63b6fa6d59)
2cf05b
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2165011
2cf05b
Signed-off-by: Thomas Huth <thuth@redhat.com>
2cf05b
---
2cf05b
 docs/schemas/nodedev.rng | 22 +++++++++-------------
2cf05b
 1 file changed, 9 insertions(+), 13 deletions(-)
2cf05b
2cf05b
diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
2cf05b
index e4733f0804..29515d2d7e 100644
2cf05b
--- a/docs/schemas/nodedev.rng
2cf05b
+++ b/docs/schemas/nodedev.rng
2cf05b
@@ -653,10 +653,7 @@
2cf05b
     </interleave>
2cf05b
   </define>
2cf05b
 
2cf05b
-  <define name="capccwdev">
2cf05b
-    <attribute name="type">
2cf05b
-      <value>ccw</value>
2cf05b
-    </attribute>
2cf05b
+  <define name="capccwaddress">
2cf05b
     <element name="cssid">
2cf05b
       <ref name="ccwCssidRange"/>
2cf05b
     </element>
2cf05b
@@ -668,19 +665,18 @@
2cf05b
     </element>
2cf05b
   </define>
2cf05b
 
2cf05b
+  <define name="capccwdev">
2cf05b
+    <attribute name="type">
2cf05b
+      <value>ccw</value>
2cf05b
+    </attribute>
2cf05b
+    <ref name="capccwaddress"/>
2cf05b
+  </define>
2cf05b
+
2cf05b
   <define name="capcssdev">
2cf05b
     <attribute name="type">
2cf05b
       <value>css</value>
2cf05b
     </attribute>
2cf05b
-    <element name="cssid">
2cf05b
-      <ref name="ccwCssidRange"/>
2cf05b
-    </element>
2cf05b
-    <element name="ssid">
2cf05b
-      <ref name="ccwSsidRange"/>
2cf05b
-    </element>
2cf05b
-    <element name="devno">
2cf05b
-      <ref name="ccwDevnoRange"/>
2cf05b
-    </element>
2cf05b
+    <ref name="capccwaddress"/>
2cf05b
     <optional>
2cf05b
       <ref name="mdev_types"/>
2cf05b
     </optional>
2cf05b
-- 
2cf05b
2.39.1
2cf05b