From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
---
data/devices/qemu-pci.xml | 2 +-
data/devices/qemu-ps2.xml | 4 ----
data/hypervisors/rhel-xen.xml | 40 ++++++++++++++++++++++++----------------
data/hypervisors/xen.xml | 19 +++++++++++++++++++
data/oses/debian.xml | 4 ++--
data/oses/macos.xml | 8 ++++----
data/oses/rhl.xml | 15 ---------------
data/oses/ubuntu.xml | 29 ++++-------------------------
data/oses/windows.xml | 1 -
9 files changed, 54 insertions(+), 68 deletions(-)
diff --git a/data/devices/qemu-pci.xml b/data/devices/qemu-pci.xml
index 656b91f..42b041c 100644
--- a/data/devices/qemu-pci.xml
+++ b/data/devices/qemu-pci.xml
@@ -142,7 +142,7 @@
<device-id>25ab</device-id>
</device>
- <device id="isa-ib700">
+ <device id="isa://ib700">
<name>ib700</name>
<bus-type>isa</bus-type>
<class>watchdog</class>
diff --git a/data/devices/qemu-ps2.xml b/data/devices/qemu-ps2.xml
index 4f732cc..71f8096 100644
--- a/data/devices/qemu-ps2.xml
+++ b/data/devices/qemu-ps2.xml
@@ -6,9 +6,7 @@
<bus-type>ps2</bus-type>
<class>input</class>
<vendor>Qemu/KVM</vendor>
- <vendor-id>qemu-kvm</vendor-id>
<device>Keyboard</device>
- <device-id>keyboard</device-id>
</device>
<device id="http://qemu.org/ps2/mouse";>
@@ -16,9 +14,7 @@
<bus-type>ps2</bus-type>
<class>input</class>
<vendor>Qemu/KVM</vendor>
- <vendor-id>qemu-kvm</vendor-id>
<device>Mouse</device>
- <device-id>mouse</device-id>
</device>
</libosinfo>
diff --git a/data/hypervisors/rhel-xen.xml b/data/hypervisors/rhel-xen.xml
index 1c50536..bd09198 100644
--- a/data/hypervisors/rhel-xen.xml
+++ b/data/hypervisors/rhel-xen.xml
@@ -1,12 +1,13 @@
<libosinfo version="0.0.1">
<platform id="http://redhat.com/rhel/5.0/xen/3.0.3";>
- <derives id="http://xen.org/xen/3.0.3"/>
-
<short-id>xen-3.0.3-rhel-5.0</short-id>
<name>Xen 3.0.3 (RHEL 5.0)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.0.3</version>
+ <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"/>
@@ -16,12 +17,13 @@
</platform>
<platform id="http://redhat.com/rhel/5.1/xen/3.1.0";>
- <derives id="http://xen.org/xen/3.1.0"/>
-
<short-id>xen-3.1.0-rhel-5.1</short-id>
<name>Xen 3.1.0 (RHEL 5.1)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.1.0</version>
+ <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"/>
@@ -31,12 +33,13 @@
</platform>
<platform id="http://redhat.com/rhel/5.2/xen/3.1.0";>
- <derives id="http://xen.org/xen/3.1.0"/>
-
<short-id>xen-3.1.0-rhel-5.2</short-id>
<name>Xen 3.1.0 (RHEL 5.2)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.1.0</version>
+ <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"/>
@@ -46,12 +49,13 @@
</platform>
<platform id="http://redhat.com/rhel/5.3/xen/3.1.0";>
- <derives id="http://xen.org/xen/3.1.0"/>
-
<short-id>xen-3.1.0-rhel-5.3</short-id>
<name>Xen 3.1.0 (RHEL 5.3)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.1.0</version>
+ <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"/>
@@ -61,12 +65,13 @@
</platform>
<platform id="http://redhat.com/rhel/5.4/xen/3.1.0";>
- <derives id="http://xen.org/xen/3.1.0"/>
-
<short-id>xen-3.1.0-rhel-5.4</short-id>
<name>Xen 3.1.0 (RHEL 5.4)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.1.0</version>
+ <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"/>
@@ -76,12 +81,13 @@
</platform>
<platform id="http://redhat.com/rhel/5.5/xen/3.1.0";>
- <derives id="http://xen.org/xen/3.1.0"/>
-
<short-id>xen-3.1.0-rhel-5.5</short-id>
<name>Xen 3.1.0 (RHEL 5.5)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.1.0</version>
+ <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"/>
@@ -91,12 +97,13 @@
</platform>
<platform id="http://redhat.com/rhel/5.6/xen/3.1.0";>
- <derives id="http://xen.org/xen/3.1.0"/>
-
<short-id>xen-3.1.0-rhel-5.6</short-id>
<name>Xen 3.1.0 (RHEL 5.6)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.1.0</version>
+ <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"/>
@@ -106,12 +113,13 @@
</platform>
<platform id="http://redhat.com/rhel/5.7/xen/3.1.0";>
- <derives id="http://xen.org/xen/3.1.0"/>
-
<short-id>xen-3.1.0-rhel-5.7</short-id>
<name>Xen 3.1.0 (RHEL 5.7)</name>
+ <vendor>Red Hat, Inc.</vendor>
<version>3.1.0</version>
+ <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"/>
diff --git a/data/hypervisors/xen.xml b/data/hypervisors/xen.xml
index 4a51c9e..d42c823 100644
--- a/data/hypervisors/xen.xml
+++ b/data/hypervisors/xen.xml
@@ -4,6 +4,7 @@
<platform id="http://xen.org/xen/3.0.2";>
<short-id>xen-3.0.2</short-id>
<name>Xen 3.0.2</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.0.2</version>
<devices>
@@ -16,6 +17,7 @@
<platform id="http://xen.org/xen/3.0.3";>
<short-id>xen-3.0.3</short-id>
<name>Xen 3.0.3</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.0.3</version>
<upgrades id="http://xen.org/xen/3.0.2"/>
@@ -29,6 +31,7 @@
<platform id="http://xen.org/xen/3.0.4";>
<short-id>xen-3.0.4</short-id>
<name>Xen 3.0.4</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.0.4</version>
<upgrades id="http://xen.org/xen/3.0.3"/>
@@ -43,6 +46,7 @@
<platform id="http://xen.org/xen/3.1.3";>
<short-id>xen-3.1.3</short-id>
<name>Xen 3.1.3</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.1.3</version>
<upgrades id="http://xen.org/xen/3.0.4"/>
@@ -57,6 +61,7 @@
<platform id="http://xen.org/xen/3.1.4";>
<short-id>xen-3.1.4</short-id>
<name>Xen 3.1.4</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.1.4</version>
<upgrades id="http://xen.org/xen/3.1.3"/>
@@ -71,6 +76,7 @@
<platform id="http://xen.org/xen/3.2.0";>
<short-id>xen-3.2.0</short-id>
<name>Xen 3.2.0</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.2.0</version>
<upgrades id="http://xen.org/xen/3.1.4"/>
@@ -85,6 +91,7 @@
<platform id="http://xen.org/xen/3.2.1";>
<short-id>xen-3.2.1</short-id>
<name>Xen 3.2.1</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.2.1</version>
<upgrades id="http://xen.org/xen/3.2.0"/>
@@ -99,6 +106,7 @@
<platform id="http://xen.org/xen/3.2.2";>
<short-id>xen-3.2.2</short-id>
<name>Xen 3.2.2</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.2.2</version>
<upgrades id="http://xen.org/xen/3.2.1"/>
@@ -113,6 +121,7 @@
<platform id="http://xen.org/xen/3.2.3";>
<short-id>xen-3.2.3</short-id>
<name>Xen 3.2.3</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.2.3</version>
<upgrades id="http://xen.org/xen/3.2.2"/>
@@ -127,6 +136,7 @@
<platform id="http://xen.org/xen/3.3.0";>
<short-id>xen-3.3.0</short-id>
<name>Xen 3.3.0</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.3.0</version>
<upgrades id="http://xen.org/xen/3.2.3"/>
@@ -141,6 +151,7 @@
<platform id="http://xen.org/xen/3.3.1";>
<short-id>xen-3.3.1</short-id>
<name>Xen 3.3.1</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.3.1</version>
<upgrades id="http://xen.org/xen/3.3.0"/>
@@ -155,6 +166,7 @@
<platform id="http://xen.org/xen/3.3.2";>
<short-id>xen-3.3.2</short-id>
<name>Xen 3.3.2</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.3.2</version>
<upgrades id="http://xen.org/xen/3.3.1"/>
@@ -169,6 +181,7 @@
<platform id="http://xen.org/xen/3.4.0";>
<short-id>xen-3.4.0</short-id>
<name>Xen 3.4.0</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.4.0</version>
<upgrades id="http://xen.org/xen/3.3.2"/>
@@ -183,6 +196,7 @@
<platform id="http://xen.org/xen/3.4.1";>
<short-id>xen-3.4.1</short-id>
<name>Xen 3.4.1</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.4.1</version>
<upgrades id="http://xen.org/xen/3.4.0"/>
@@ -197,6 +211,7 @@
<platform id="http://xen.org/xen/3.4.2";>
<short-id>xen-3.4.2</short-id>
<name>Xen 3.4.2</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.4.2</version>
<upgrades id="http://xen.org/xen/3.4.1"/>
@@ -211,6 +226,7 @@
<platform id="http://xen.org/xen/3.4.3";>
<short-id>xen-3.4.3</short-id>
<name>Xen 3.4.3</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>3.4.3</version>
<upgrades id="http://xen.org/xen/3.4.2"/>
@@ -225,6 +241,7 @@
<platform id="http://xen.org/xen/4.0.0";>
<short-id>xen-4.0.0</short-id>
<name>Xen 4.0.0</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>4.0.0</version>
<upgrades id="http://xen.org/xen/3.4.3"/>
@@ -239,6 +256,7 @@
<platform id="http://xen.org/xen/4.0.1";>
<short-id>xen-4.0.1</short-id>
<name>Xen 4.0.1</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>4.0.1</version>
<upgrades id="http://xen.org/xen/4.0.0"/>
@@ -253,6 +271,7 @@
<platform id="http://xen.org/xen/4.1.0";>
<short-id>xen-4.1.0</short-id>
<name>Xen 4.1.0</name>
+ <vendor>Citrix Systems, Inc.</vendor>
<version>4.1.0</version>
<upgrades id="http://xen.org/xen/4.0.1"/>
diff --git a/data/oses/debian.xml b/data/oses/debian.xml
index 217e338..70aaafc 100644
--- a/data/oses/debian.xml
+++ b/data/oses/debian.xml
@@ -106,7 +106,7 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpu>1</n-cpu>
+ <n-cpus>1</n-cpus>
<ram>134217728</ram>
<storage>5368709120</storage>
</minimum>
@@ -134,7 +134,7 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpu>1</n-cpu>
+ <n-cpus>1</n-cpus>
<ram>134217728</ram>
<storage>5368709120</storage>
</minimum>
diff --git a/data/oses/macos.xml b/data/oses/macos.xml
index 84aaa58..258512a 100644
--- a/data/oses/macos.xml
+++ b/data/oses/macos.xml
@@ -62,12 +62,12 @@
<upgrades id="http://apple.com/macosx/10.5"; />
<resources arch="all">
- <minimal>
+ <minimum>
<n-cpus>2</n-cpus>
<cpu>1600000000</cpu>
<ram>2147483648</ram>
<storage>7516192768</storage>
- </minimal>
+ </minimum>
</resources>
</os>
@@ -81,12 +81,12 @@
<upgrades id="http://apple.com/macosx/10.6"; />
<resources arch="all">
- <minimal>
+ <minimum>
<n-cpus>2</n-cpus>
<cpu>1600000000</cpu>
<ram>2147483648</ram>
<storage>7516192768</storage>
- </minimal>
+ </minimum>
</resources>
</os>
diff --git a/data/oses/rhl.xml b/data/oses/rhl.xml
index 632dc9c..398bd73 100644
--- a/data/oses/rhl.xml
+++ b/data/oses/rhl.xml
@@ -9,7 +9,6 @@
<codename>Mother's Day</codename>
<release-date>1994-11-03</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/1.1";>
@@ -23,7 +22,6 @@
<derives-from id="http://redhat.com/rhl/1.0"/>
<release-date>1995-08-01</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/2.0";>
@@ -36,7 +34,6 @@
<derives-from id="http://redhat.com/rhl/1.1"/>
<release-date>1995-09-20</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/2.1";>
@@ -49,7 +46,6 @@
<derives-from id="http://redhat.com/rhl/2.0"/>
<release-date>1995-11-23</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/3.0.3";>
@@ -63,7 +59,6 @@
<derives-from id="http://redhat.com/rhl/2.1"/>
<release-date>1996-05-01</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/4.0";>
@@ -77,7 +72,6 @@
<derives-from id="http://redhat.com/rhl/3.0.3"/>
<release-date>1996-10-03</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/4.1";>
@@ -91,7 +85,6 @@
<derives-from id="http://redhat.com/rhl/4.0"/>
<release-date>1997-02-03</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/4.2";>
@@ -105,7 +98,6 @@
<derives-from id="http://redhat.com/rhl/4.1"/>
<release-date>1997-05-19</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/5.0";>
@@ -119,7 +111,6 @@
<derives-from id="http://redhat.com/rhl/4.2"/>
<release-date>1997-12-01</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/5.1";>
@@ -133,7 +124,6 @@
<derives-from id="http://redhat.com/rhl/5.0"/>
<release-date>1998-05-22</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/5.2";>
@@ -147,7 +137,6 @@
<derives-from id="http://redhat.com/rhl/5.1"/>
<release-date>1998-11-02</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/6.0";>
@@ -161,7 +150,6 @@
<derives-from id="http://redhat.com/rhl/5.1"/>
<release-date>1999-04-26</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/6.1";>
@@ -175,7 +163,6 @@
<derives-from id="http://redhat.com/rhl/6.0"/>
<release-date>1999-10-04</release-date>
- <eol-date></eol-date>
</os>
<os id="http://redhat.com/rhl/6.2";>
@@ -189,7 +176,6 @@
<derives-from id="http://redhat.com/rhl/6.1"/>
<release-date>2000-04-03</release-date>
- <eol-date>2003-03-31</eol-date>
</os>
<os id="http://redhat.com/rhl/7";>
@@ -203,7 +189,6 @@
<derives-from id="http://redhat.com/rhl/6.1"/>
<release-date>2000-09-25</release-date>
- <eol-date>2003-03-31</eol-date>
</os>
<os id="http://redhat.com/rhl/7.1";>
diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml
index 2c306b7..e2feb48 100644
--- a/data/oses/ubuntu.xml
+++ b/data/oses/ubuntu.xml
@@ -787,7 +787,7 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpu>1</n-cpu>
+ <n-cpus>1</n-cpus>
<ram>67108864</ram>
<storage>5368709120</storage>
</minimum>
@@ -797,27 +797,6 @@
<storage>5368709120</storage>
</recommended>
</resources>
-
-
- <media arch="i386">
- <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-server-i386.iso</url>
- <iso>
- <volume-id>Ubuntu(-Server)? 10.04 i386</volume-id>
- <system-id>LINUX</system-id>
- </iso>
- <kernel>casper/vmlinuz</kernel>
- <initrd>casper/initrd.img</initrd>
- </media>
- <media arch="x86_64">
- <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-server-amd64.iso</url>
- <iso>
- <volume-id>Ubuntu(-Server)? 10.04 amd64</volume-id>
- <system-id>LINUX</system-id>
- </iso>
- <kernel>casper/vmlinuz</kernel>
- <initrd>casper/initrd.img</initrd>
- </media>
-
<media arch="i386" live="true">
<url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url>
<iso>
@@ -853,7 +832,7 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpu>1</n-cpu>
+ <n-cpus>1</n-cpus>
<ram>67108864</ram>
<storage>5368709120</storage>
</minimum>
@@ -918,7 +897,7 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpu>1</n-cpu>
+ <n-cpus>1</n-cpus>
<ram>67108864</ram>
<storage>5368709120</storage>
</minimum>
@@ -983,7 +962,7 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpu>1</n-cpu>
+ <n-cpus>1</n-cpus>
<ram>67108864</ram>
<storage>5368709120</storage>
</minimum>
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
index 45624e3..69dec27 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml
@@ -89,7 +89,6 @@
<media arch="i386">
<iso>
<volume-id>WIN2000</volume-id>
- <publisher-id>MICROSOFT CORPORATION</publisher-id>
</iso>
</media>
--
1.7.7.6
