Every Xen hypervisor platform has duplicated the list of
supported devices. The RHEL Xen platforms also missed out
the <upgrades> relationships. Remove all the device
duplication and rely on inheritance instead.
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
data/hypervisors/rhel-xen.xml.in | 59 +++---------------
data/hypervisors/xen.xml.in | 127 ---------------------------------------
2 files changed, 7 insertions(+), 179 deletions(-)
diff --git a/data/hypervisors/rhel-xen.xml.in b/data/hypervisors/rhel-xen.xml.in
index a67dc4e..5237482 100644
--- a/data/hypervisors/rhel-xen.xml.in
+++ b/data/hypervisors/rhel-xen.xml.in
@@ -9,9 +9,6 @@
<derives-from id="http://xen.org/xen/3.0.3"/>
<devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
<device id="http://xen.org/devices/framebuffer"/>
</devices>
</platform>
@@ -22,14 +19,8 @@
<_vendor>Red Hat, Inc.</_vendor>
<version>3.1.0</version>
+ <upgrades id="http://redhat.com/rhel/5.0/xen/3.0.3"/>
<derives-from id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://redhat.com/rhel/5.2/xen/3.1.0";>
@@ -38,14 +29,8 @@
<_vendor>Red Hat, Inc.</_vendor>
<version>3.1.0</version>
+ <upgrades id="http://redhat.com/rhel/5.1/xen/3.1.0"/>
<derives-from id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://redhat.com/rhel/5.3/xen/3.1.0";>
@@ -54,14 +39,8 @@
<_vendor>Red Hat, Inc.</_vendor>
<version>3.1.0</version>
+ <upgrades id="http://redhat.com/rhel/5.2/xen/3.1.0"/>
<derives-from id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://redhat.com/rhel/5.4/xen/3.1.0";>
@@ -70,14 +49,8 @@
<_vendor>Red Hat, Inc.</_vendor>
<version>3.1.0</version>
+ <upgrades id="http://redhat.com/rhel/5.3/xen/3.1.0"/>
<derives-from id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://redhat.com/rhel/5.5/xen/3.1.0";>
@@ -86,14 +59,8 @@
<_vendor>Red Hat, Inc.</_vendor>
<version>3.1.0</version>
+ <upgrades id="http://redhat.com/rhel/5.4/xen/3.1.0"/>
<derives-from id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://redhat.com/rhel/5.6/xen/3.1.0";>
@@ -102,14 +69,8 @@
<_vendor>Red Hat, Inc.</_vendor>
<version>3.1.0</version>
+ <upgrades id="http://redhat.com/rhel/5.5/xen/3.1.0"/>
<derives-from id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://redhat.com/rhel/5.7/xen/3.1.0";>
@@ -118,14 +79,8 @@
<_vendor>Red Hat, Inc.</_vendor>
<version>3.1.0</version>
+ <upgrades id="http://redhat.com/rhel/5.6/xen/3.1.0"/>
<derives-from id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
</libosinfo>
diff --git a/data/hypervisors/xen.xml.in b/data/hypervisors/xen.xml.in
index be23796..8a88b7a 100644
--- a/data/hypervisors/xen.xml.in
+++ b/data/hypervisors/xen.xml.in
@@ -21,11 +21,6 @@
<version>3.0.3</version>
<upgrades id="http://xen.org/xen/3.0.2"/>
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.0.4";>
@@ -36,9 +31,6 @@
<upgrades id="http://xen.org/xen/3.0.3"/>
<devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
<device id="http://xen.org/devices/framebuffer"/>
</devices>
</platform>
@@ -49,13 +41,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.1.0</version>
<upgrades id="http://xen.org/xen/3.0.4"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.1.3";>
@@ -64,13 +49,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.1.3</version>
<upgrades id="http://xen.org/xen/3.1.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.1.4";>
@@ -79,13 +57,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.1.4</version>
<upgrades id="http://xen.org/xen/3.1.3"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.2.0";>
@@ -94,13 +65,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.2.0</version>
<upgrades id="http://xen.org/xen/3.1.4"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.2.1";>
@@ -109,13 +73,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.2.1</version>
<upgrades id="http://xen.org/xen/3.2.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.2.2";>
@@ -124,13 +81,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.2.2</version>
<upgrades id="http://xen.org/xen/3.2.1"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.2.3";>
@@ -139,13 +89,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.2.3</version>
<upgrades id="http://xen.org/xen/3.2.2"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.3.0";>
@@ -154,13 +97,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.3.0</version>
<upgrades id="http://xen.org/xen/3.2.3"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.3.1";>
@@ -169,13 +105,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.3.1</version>
<upgrades id="http://xen.org/xen/3.3.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.3.2";>
@@ -184,13 +113,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.3.2</version>
<upgrades id="http://xen.org/xen/3.3.1"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.4.0";>
@@ -199,13 +121,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.4.0</version>
<upgrades id="http://xen.org/xen/3.3.2"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.4.1";>
@@ -214,13 +129,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.4.1</version>
<upgrades id="http://xen.org/xen/3.4.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.4.2";>
@@ -229,13 +137,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.4.2</version>
<upgrades id="http://xen.org/xen/3.4.1"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/3.4.3";>
@@ -244,13 +145,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>3.4.3</version>
<upgrades id="http://xen.org/xen/3.4.2"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/4.0.0";>
@@ -259,13 +153,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>4.0.0</version>
<upgrades id="http://xen.org/xen/3.4.3"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/4.0.1";>
@@ -274,13 +161,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>4.0.1</version>
<upgrades id="http://xen.org/xen/4.0.0"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
<platform id="http://xen.org/xen/4.1.0";>
@@ -289,13 +169,6 @@
<_vendor>Citrix Systems, Inc.</_vendor>
<version>4.1.0</version>
<upgrades id="http://xen.org/xen/4.0.1"/>
-
- <devices>
- <device id="http://xen.org/devices/block"/>
- <device id="http://xen.org/devices/net"/>
- <device id="http://xen.org/devices/console"/>
- <device id="http://xen.org/devices/framebuffer"/>
- </devices>
</platform>
--
2.4.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
