[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libosinfo] [PATCH osinfo-db 1/9] os: Add a name comment with every <device> block



This greatly improves XML readability and grep-ability for
<device> tags

Signed-off-by: Cole Robinson <crobinso redhat com>
---
 data/os/altlinux.org/altlinux-5.0.xml.in      |  4 +-
 data/os/altlinux.org/altlinux-6.0.xml.in      |  2 +-
 data/os/debian.org/debian-5.xml.in            |  4 +-
 data/os/debian.org/debian-6.xml.in            |  2 +-
 data/os/debian.org/debian-7.xml.in            |  4 +-
 data/os/debian.org/debian-9.xml.in            | 16 ++---
 data/os/fedoraproject.org/fedora-1.xml.in     |  4 +-
 data/os/fedoraproject.org/fedora-11.xml.in    |  2 +-
 data/os/fedoraproject.org/fedora-24.xml.in    |  2 +-
 data/os/fedoraproject.org/fedora-9.xml.in     |  1 -
 data/os/freebsd.org/freebsd-6.0.xml.in        |  2 +-
 data/os/freebsd.org/freebsd-8.0.xml.in        |  2 +-
 .../os/gnome.org/gnome-continuous-3.10.xml.in |  6 +-
 data/os/mageia.org/mageia-1.xml.in            |  6 +-
 data/os/mandriva.com/mandriva-2010.0.xml.in   |  4 +-
 data/os/mandriva.com/mes-5.1.xml.in           |  4 +-
 data/os/microsoft.com/win-10.xml.in           |  2 +-
 data/os/microsoft.com/win-2k.xml.in           |  8 +--
 data/os/microsoft.com/win-7.xml.in            | 26 ++++----
 data/os/microsoft.com/win-8.1.xml.in          |  2 +-
 data/os/microsoft.com/win-8.xml.in            |  2 +-
 data/os/microsoft.com/win-95.xml.in           |  8 +--
 data/os/microsoft.com/win-xp.xml.in           | 24 +++----
 data/os/openbsd.org/openbsd-4.9.xml.in        |  2 +-
 data/os/opensuse.org/opensuse-10.2.xml.in     |  2 +-
 data/os/opensuse.org/opensuse-11.1.xml.in     |  2 +-
 data/os/opensuse.org/opensuse-12.3.xml.in     | 12 ++--
 data/os/opensuse.org/opensuse-15.0.xml.in     | 18 ++---
 data/os/opensuse.org/opensuse-42.2.xml.in     | 18 ++---
 data/os/opensuse.org/opensuse-42.3.xml.in     | 18 ++---
 .../opensuse.org/opensuse-tumbleweed.xml.in   | 34 +++++-----
 data/os/redhat.com/rhel-5.6.xml.in            |  4 +-
 data/os/redhat.com/rhel-6.0.xml.in            |  6 +-
 data/os/redhat.com/rhel-7.0.xml.in            |  6 +-
 data/os/redhat.com/rhel-atomic-7.0.xml.in     |  6 +-
 data/os/sun.com/opensolaris-2009.06.xml.in    |  2 +-
 data/os/sun.com/solaris-10.xml.in             |  2 +-
 data/os/suse.com/sled-10.2.xml.in             |  2 +-
 data/os/suse.com/sled-11.3.xml.in             | 16 ++---
 data/os/suse.com/sled-11.xml.in               |  2 +-
 data/os/suse.com/sled-12.2.xml.in             | 18 ++---
 data/os/suse.com/sled-12.3.xml.in             | 18 ++---
 data/os/suse.com/sles-10.2.xml.in             |  2 +-
 data/os/suse.com/sles-11.3.xml.in             | 16 ++---
 data/os/suse.com/sles-11.xml.in               |  2 +-
 data/os/suse.com/sles-12.2.xml.in             | 18 ++---
 data/os/suse.com/sles-12.3.xml.in             | 18 ++---
 data/os/ubuntu.com/ubuntu-5.04.xml.in         |  2 +-
 data/os/ubuntu.com/ubuntu-8.04.xml.in         |  2 +-
 data/os/ubuntu.com/ubuntu-9.04.xml.in         |  2 +-
 data/platform/qemu.org/qemu-1.0.xml.in        | 65 +++++++------------
 .../redhat.com/xen-rhel-3.0.3.5.0.xml.in      |  2 +-
 data/platform/xen.org/xen-3.0.2.xml.in        |  6 +-
 data/platform/xen.org/xen-3.0.4.xml.in        |  2 +-
 54 files changed, 220 insertions(+), 242 deletions(-)

diff --git a/data/os/altlinux.org/altlinux-5.0.xml.in b/data/os/altlinux.org/altlinux-5.0.xml.in
index d2ceb33..940270b 100644
--- a/data/os/altlinux.org/altlinux-5.0.xml.in
+++ b/data/os/altlinux.org/altlinux-5.0.xml.in
@@ -14,8 +14,8 @@
     <release-date>2009-10-29</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/altlinux.org/altlinux-6.0.xml.in b/data/os/altlinux.org/altlinux-6.0.xml.in
index c0b2e1b..c16914e 100644
--- a/data/os/altlinux.org/altlinux-6.0.xml.in
+++ b/data/os/altlinux.org/altlinux-6.0.xml.in
@@ -14,7 +14,7 @@
     <release-date>2011-10-26</release-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/debian.org/debian-5.xml.in b/data/os/debian.org/debian-5.xml.in
index efd8085..21fd067 100644
--- a/data/os/debian.org/debian-5.xml.in
+++ b/data/os/debian.org/debian-5.xml.in
@@ -16,8 +16,8 @@
     <eol-date>2012-02-06</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in
index a0fc4d2..7ff7607 100644
--- a/data/os/debian.org/debian-6.xml.in
+++ b/data/os/debian.org/debian-6.xml.in
@@ -16,7 +16,7 @@
     <eol-date>2016-02-29</eol-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in
index 8c2d4ca..5f3a94c 100644
--- a/data/os/debian.org/debian-7.xml.in
+++ b/data/os/debian.org/debian-7.xml.in
@@ -16,12 +16,12 @@
     <eol-date>2018-05-31</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
       <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
       <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
       <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
       <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index 54bdde3..d90ceb9 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -15,14 +15,14 @@
     <release-date>2017-06-17</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/fedoraproject.org/fedora-1.xml.in b/data/os/fedoraproject.org/fedora-1.xml.in
index 27ad7e0..a10152b 100644
--- a/data/os/fedoraproject.org/fedora-1.xml.in
+++ b/data/os/fedoraproject.org/fedora-1.xml.in
@@ -18,8 +18,8 @@
     <!-- XXX upgrades/derives RHL -->
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
     </devices>
 
     <!-- Disk 1 -->
diff --git a/data/os/fedoraproject.org/fedora-11.xml.in b/data/os/fedoraproject.org/fedora-11.xml.in
index aedd647..ff2a21e 100644
--- a/data/os/fedoraproject.org/fedora-11.xml.in
+++ b/data/os/fedoraproject.org/fedora-11.xml.in
@@ -16,7 +16,7 @@
     <eol-date>2010-06-25</eol-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <!-- DVD -->
diff --git a/data/os/fedoraproject.org/fedora-24.xml.in b/data/os/fedoraproject.org/fedora-24.xml.in
index a405b6d..c7fc170 100644
--- a/data/os/fedoraproject.org/fedora-24.xml.in
+++ b/data/os/fedoraproject.org/fedora-24.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2017-08-08</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio-gpu -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <variant id="workstation">
diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
index a99ba46..fff246d 100644
--- a/data/os/fedoraproject.org/fedora-9.xml.in
+++ b/data/os/fedoraproject.org/fedora-9.xml.in
@@ -19,7 +19,6 @@
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
       <!-- Apparently F9 has selinux errors when installing with virtio:
            https://bugzilla.redhat.com/show_bug.cgi?id=470386
-      <device id="http://pcisig.com/pci/1af4/1001"/>
       -->
       <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
       <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
diff --git a/data/os/freebsd.org/freebsd-6.0.xml.in b/data/os/freebsd.org/freebsd-6.0.xml.in
index 53e7bb5..cecdd16 100644
--- a/data/os/freebsd.org/freebsd-6.0.xml.in
+++ b/data/os/freebsd.org/freebsd-6.0.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2007-01-31</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/10ec/8029"/>
+      <device id="http://pcisig.com/pci/10ec/8029"/> <!-- ne2k_pci -->
     </devices>
   </os>
 </libosinfo>
diff --git a/data/os/freebsd.org/freebsd-8.0.xml.in b/data/os/freebsd.org/freebsd-8.0.xml.in
index 80ae9b4..6db8487 100644
--- a/data/os/freebsd.org/freebsd-8.0.xml.in
+++ b/data/os/freebsd.org/freebsd-8.0.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2010-11-30</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/100e"/> <!--- Intel e1000 NIC -->
+      <device id="http://pcisig.com/pci/8086/100e"/> <!-- e1000 -->
     </devices>
   </os>
 </libosinfo>
diff --git a/data/os/gnome.org/gnome-continuous-3.10.xml.in b/data/os/gnome.org/gnome-continuous-3.10.xml.in
index cfc3859..cfc3e23 100644
--- a/data/os/gnome.org/gnome-continuous-3.10.xml.in
+++ b/data/os/gnome.org/gnome-continuous-3.10.xml.in
@@ -13,11 +13,11 @@
     <release-date>2013-09-25</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
       <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/mageia.org/mageia-1.xml.in b/data/os/mageia.org/mageia-1.xml.in
index 01bc3f4..0a4da09 100644
--- a/data/os/mageia.org/mageia-1.xml.in
+++ b/data/os/mageia.org/mageia-1.xml.in
@@ -15,9 +15,9 @@
     <devices>
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
       <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet aka mouse integration -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/mandriva.com/mandriva-2010.0.xml.in b/data/os/mandriva.com/mandriva-2010.0.xml.in
index 5067bc1..64d697d 100644
--- a/data/os/mandriva.com/mandriva-2010.0.xml.in
+++ b/data/os/mandriva.com/mandriva-2010.0.xml.in
@@ -15,8 +15,8 @@
     <eol-date>2012-11-03</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </devices>
   </os>
 </libosinfo>
diff --git a/data/os/mandriva.com/mes-5.1.xml.in b/data/os/mandriva.com/mes-5.1.xml.in
index 20939a6..9a202a4 100644
--- a/data/os/mandriva.com/mes-5.1.xml.in
+++ b/data/os/mandriva.com/mes-5.1.xml.in
@@ -15,8 +15,8 @@
     <eol-date>2014-06-16</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </devices>
   </os>
 </libosinfo>
diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index b44a38c..737f6ce 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -112,7 +112,7 @@
     </resources>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 -->
     </devices>
 
     <installer>
diff --git a/data/os/microsoft.com/win-2k.xml.in b/data/os/microsoft.com/win-2k.xml.in
index cd0a7e6..b6428bd 100644
--- a/data/os/microsoft.com/win-2k.xml.in
+++ b/data/os/microsoft.com/win-2k.xml.in
@@ -14,10 +14,10 @@
     <eol-date>2010-07-13</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/1234/1111"/> <!-- VGA -->
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/1234/1111"/> <!-- vga -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/microsoft.com/win-7.xml.in b/data/os/microsoft.com/win-7.xml.in
index 1e6e042..fc196a0 100644
--- a/data/os/microsoft.com/win-7.xml.in
+++ b/data/os/microsoft.com/win-7.xml.in
@@ -181,7 +181,7 @@
     </resources>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 -->
     </devices>
 
     <installer>
@@ -195,14 +195,14 @@
       <file>viostor.cat</file>
       <file>viostor.inf</file>
       <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </driver>
 
     <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/amd64"; pre-installable="true" signed="false">
       <file>viostor.cat</file>
       <file>viostor.inf</file>
       <file>viostor.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </driver>
 
     <!-- All virtio and QXL device drivers, and spice-vdagent -->
@@ -211,11 +211,11 @@
       <file>spice-guest-tools-0.65.cmd</file>
       <file>redhat09.cer</file>
       <file>redhat10.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
     </driver>
 
     <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false">
@@ -223,11 +223,11 @@
       <file>spice-guest-tools-0.65.cmd</file>
       <file>redhat09.cer</file>
       <file>redhat10.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
     </driver>
   </os>
 </libosinfo>
diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index dc3fbf7..d5dcd6f 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -133,7 +133,7 @@
     </resources>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 -->
     </devices>
 
     <installer>
diff --git a/data/os/microsoft.com/win-8.xml.in b/data/os/microsoft.com/win-8.xml.in
index 5e66623..7e09531 100644
--- a/data/os/microsoft.com/win-8.xml.in
+++ b/data/os/microsoft.com/win-8.xml.in
@@ -133,7 +133,7 @@
     </resources>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 -->
     </devices>
 
     <installer>
diff --git a/data/os/microsoft.com/win-95.xml.in b/data/os/microsoft.com/win-95.xml.in
index 69654ad..2fdcf18 100644
--- a/data/os/microsoft.com/win-95.xml.in
+++ b/data/os/microsoft.com/win-95.xml.in
@@ -15,10 +15,10 @@
     <eol-date>2001-12-13</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/1234/1111"/> <!-- VGA -->
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/1234/1111"/> <!-- vga -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
     </devices>
 
     <resources arch="i686">
diff --git a/data/os/microsoft.com/win-xp.xml.in b/data/os/microsoft.com/win-xp.xml.in
index ca0b660..086ade6 100644
--- a/data/os/microsoft.com/win-xp.xml.in
+++ b/data/os/microsoft.com/win-xp.xml.in
@@ -75,7 +75,7 @@
       <file>viostor.sys</file>
       <!-- For now we require this for pre-installation but we should probably generate this too -->
       <file>txtsetup.oem</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </driver>
 
     <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/amd64"; pre-installable="true" signed="false">
@@ -84,7 +84,7 @@
       <file>viostor.sys</file>
       <!-- For now we require this for pre-installation but we should probably generate this too -->
       <file>txtsetup.oem</file>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </driver>
 
     <!-- All virtio and QXL device drivers, and spice-vdagent -->
@@ -93,11 +93,11 @@
       <file>spice-guest-tools-0.65.cmd</file>
       <file>redhat09.cer</file>
       <file>redhat10.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
     </driver>
 
     <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false">
@@ -105,11 +105,11 @@
       <file>spice-guest-tools-0.65.cmd</file>
       <file>redhat09.cer</file>
       <file>redhat10.cer</file>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
     </driver>
   </os>
 </libosinfo>
diff --git a/data/os/openbsd.org/openbsd-4.9.xml.in b/data/os/openbsd.org/openbsd-4.9.xml.in
index 66f5524..88c05f9 100644
--- a/data/os/openbsd.org/openbsd-4.9.xml.in
+++ b/data/os/openbsd.org/openbsd-4.9.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2012-05-01</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1022/2000"/>
+      <device id="http://pcisig.com/pci/1022/2000"/> <!-- pcnet -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/opensuse.org/opensuse-10.2.xml.in b/data/os/opensuse.org/opensuse-10.2.xml.in
index 1d1ed5f..04739fd 100644
--- a/data/os/opensuse.org/opensuse-10.2.xml.in
+++ b/data/os/opensuse.org/opensuse-10.2.xml.in
@@ -13,7 +13,7 @@
     <eol-date>2008-11-30</eol-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/opensuse.org/opensuse-11.1.xml.in b/data/os/opensuse.org/opensuse-11.1.xml.in
index 34c1df5..8bc07ac 100644
--- a/data/os/opensuse.org/opensuse-11.1.xml.in
+++ b/data/os/opensuse.org/opensuse-11.1.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2011-01-14</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/opensuse.org/opensuse-12.3.xml.in b/data/os/opensuse.org/opensuse-12.3.xml.in
index 5b8e3f1..979b007 100644
--- a/data/os/opensuse.org/opensuse-12.3.xml.in
+++ b/data/os/opensuse.org/opensuse-12.3.xml.in
@@ -15,14 +15,14 @@
     <eol-date>2015-01-29</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
       <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <device id="http://pcisig.com/pci/1af4/1009"/>
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1005"/> <!-- virtio-rng -->
+      <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/opensuse.org/opensuse-15.0.xml.in b/data/os/opensuse.org/opensuse-15.0.xml.in
index 1ab497e..8f1fb4c 100644
--- a/data/os/opensuse.org/opensuse-15.0.xml.in
+++ b/data/os/opensuse.org/opensuse-15.0.xml.in
@@ -21,15 +21,15 @@
     </variant>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <!-- DVD -->
diff --git a/data/os/opensuse.org/opensuse-42.2.xml.in b/data/os/opensuse.org/opensuse-42.2.xml.in
index 72b1c06..2e77055 100644
--- a/data/os/opensuse.org/opensuse-42.2.xml.in
+++ b/data/os/opensuse.org/opensuse-42.2.xml.in
@@ -15,15 +15,15 @@
     <eol-date>2018-05-16</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <media arch="x86_64">
diff --git a/data/os/opensuse.org/opensuse-42.3.xml.in b/data/os/opensuse.org/opensuse-42.3.xml.in
index 7371a29..3448ba6 100644
--- a/data/os/opensuse.org/opensuse-42.3.xml.in
+++ b/data/os/opensuse.org/opensuse-42.3.xml.in
@@ -22,15 +22,15 @@
     </variant>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <!-- DVD -->
diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
index 35f6f60..ff0a460 100644
--- a/data/os/opensuse.org/opensuse-tumbleweed.xml.in
+++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
@@ -22,25 +22,25 @@
     </variant>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
       <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <device id="http://pcisig.com/pci/1af4/1009"/>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1005"/> <!-- virtio-rng -->
+      <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <!-- DVD Image -->
diff --git a/data/os/redhat.com/rhel-5.6.xml.in b/data/os/redhat.com/rhel-5.6.xml.in
index b335c0a..a140243 100644
--- a/data/os/redhat.com/rhel-5.6.xml.in
+++ b/data/os/redhat.com/rhel-5.6.xml.in
@@ -16,8 +16,8 @@
     <eol-date>2020-03-31</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in
index b2e058f..522479d 100644
--- a/data/os/redhat.com/rhel-6.0.xml.in
+++ b/data/os/redhat.com/rhel-6.0.xml.in
@@ -14,9 +14,9 @@
     <eol-date>2023-11-30</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index e841ab3..6fa9232 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -14,9 +14,9 @@
     <release-date>2014-06-10</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
       <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
     </devices>
diff --git a/data/os/redhat.com/rhel-atomic-7.0.xml.in b/data/os/redhat.com/rhel-atomic-7.0.xml.in
index 1ee58b2..4d20f32 100644
--- a/data/os/redhat.com/rhel-atomic-7.0.xml.in
+++ b/data/os/redhat.com/rhel-atomic-7.0.xml.in
@@ -13,9 +13,9 @@
     <release-date>2014-06-10</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
       <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
       <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
     </devices>
diff --git a/data/os/sun.com/opensolaris-2009.06.xml.in b/data/os/sun.com/opensolaris-2009.06.xml.in
index 9b67c2c..21f10c8 100644
--- a/data/os/sun.com/opensolaris-2009.06.xml.in
+++ b/data/os/sun.com/opensolaris-2009.06.xml.in
@@ -12,7 +12,7 @@
     <release-date>2009-06-01</release-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
   </os>
 </libosinfo>
diff --git a/data/os/sun.com/solaris-10.xml.in b/data/os/sun.com/solaris-10.xml.in
index 407d24f..58e917a 100644
--- a/data/os/sun.com/solaris-10.xml.in
+++ b/data/os/sun.com/solaris-10.xml.in
@@ -13,7 +13,7 @@
     <release-date>2005-01-31</release-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
   </os>
 </libosinfo>
diff --git a/data/os/suse.com/sled-10.2.xml.in b/data/os/suse.com/sled-10.2.xml.in
index 80ae813..b9139be 100644
--- a/data/os/suse.com/sled-10.2.xml.in
+++ b/data/os/suse.com/sled-10.2.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2010-04-11</eol-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/suse.com/sled-11.3.xml.in b/data/os/suse.com/sled-11.3.xml.in
index 21669e0..2e5cbc5 100644
--- a/data/os/suse.com/sled-11.3.xml.in
+++ b/data/os/suse.com/sled-11.3.xml.in
@@ -15,14 +15,14 @@
     <eol-date>2016-01-31</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <device id="http://pcisig.com/pci/1af4/1009"/>
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1005"/> <!-- virtio-rng -->
+      <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/suse.com/sled-11.xml.in b/data/os/suse.com/sled-11.xml.in
index b2db6be..343f0b2 100644
--- a/data/os/suse.com/sled-11.xml.in
+++ b/data/os/suse.com/sled-11.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2010-12-31</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2415"/>
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/suse.com/sled-12.2.xml.in b/data/os/suse.com/sled-12.2.xml.in
index 2715075..67d2b17 100644
--- a/data/os/suse.com/sled-12.2.xml.in
+++ b/data/os/suse.com/sled-12.2.xml.in
@@ -14,15 +14,15 @@
     <release-date>2016-11-08</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <media arch="x86_64">
diff --git a/data/os/suse.com/sled-12.3.xml.in b/data/os/suse.com/sled-12.3.xml.in
index 013cae6..6d9016f 100644
--- a/data/os/suse.com/sled-12.3.xml.in
+++ b/data/os/suse.com/sled-12.3.xml.in
@@ -14,15 +14,15 @@
     <release-date>2017-09-07</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <media arch="x86_64">
diff --git a/data/os/suse.com/sles-10.2.xml.in b/data/os/suse.com/sles-10.2.xml.in
index 2156772..268a4e2 100644
--- a/data/os/suse.com/sles-10.2.xml.in
+++ b/data/os/suse.com/sles-10.2.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2010-04-11</eol-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/suse.com/sles-11.3.xml.in b/data/os/suse.com/sles-11.3.xml.in
index 98c4661..6b14a4c 100644
--- a/data/os/suse.com/sles-11.3.xml.in
+++ b/data/os/suse.com/sles-11.3.xml.in
@@ -15,14 +15,14 @@
     <eol-date>2016-01-31</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <device id="http://pcisig.com/pci/1af4/1004"/>
-      <device id="http://pcisig.com/pci/1af4/1005"/>
-      <device id="http://pcisig.com/pci/1af4/1009"/>
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1005"/> <!-- virtio-rng -->
+      <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/suse.com/sles-11.xml.in b/data/os/suse.com/sles-11.xml.in
index c0dc697..57015e9 100644
--- a/data/os/suse.com/sles-11.xml.in
+++ b/data/os/suse.com/sles-11.xml.in
@@ -15,7 +15,7 @@
     <eol-date>2010-12-31</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/8086/2415"/>
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
     </devices>
   </os>
 </libosinfo>
diff --git a/data/os/suse.com/sles-12.2.xml.in b/data/os/suse.com/sles-12.2.xml.in
index b3f94bd..dccc443 100644
--- a/data/os/suse.com/sles-12.2.xml.in
+++ b/data/os/suse.com/sles-12.2.xml.in
@@ -14,15 +14,15 @@
     <release-date>2016-11-08</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <media arch="x86_64">
diff --git a/data/os/suse.com/sles-12.3.xml.in b/data/os/suse.com/sles-12.3.xml.in
index 0ec60f5..c88ee8c 100644
--- a/data/os/suse.com/sles-12.3.xml.in
+++ b/data/os/suse.com/sles-12.3.xml.in
@@ -14,15 +14,15 @@
     <release-date>2017-09-07</release-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
     </devices>
 
     <media arch="x86_64">
diff --git a/data/os/ubuntu.com/ubuntu-5.04.xml.in b/data/os/ubuntu.com/ubuntu-5.04.xml.in
index c6ef675..5fa9e02 100644
--- a/data/os/ubuntu.com/ubuntu-5.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-5.04.xml.in
@@ -17,7 +17,7 @@
     <eol-date>2006-10-31</eol-date>
 
     <devices>
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB Tablet -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in
index 6a47512..e322f72 100644
--- a/data/os/ubuntu.com/ubuntu-8.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-8.04.xml.in
@@ -17,7 +17,7 @@
     <eol-date>2013-05-09</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
     </devices>
 
     <media arch="i686">
diff --git a/data/os/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in
index 865d221..d925615 100644
--- a/data/os/ubuntu.com/ubuntu-9.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-9.04.xml.in
@@ -17,7 +17,7 @@
     <eol-date>2010-10-23</eol-date>
 
     <devices>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
     </devices>
 
     <media arch="i686">
diff --git a/data/platform/qemu.org/qemu-1.0.xml.in b/data/platform/qemu.org/qemu-1.0.xml.in
index 7a0fd79..f348ac8 100644
--- a/data/platform/qemu.org/qemu-1.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.0.xml.in
@@ -9,49 +9,28 @@
     <release-date>2011-12-01</release-date>
 
     <devices>
-      <!-- block: LSI -->
-      <device id="http://pcisig.com/pci/1000/0012"/>
-      <!-- video: vga -->
-      <device id="http://pcisig.com/pci/1234/1111"/>
-      <!-- video: cirrus -->
-      <device id="http://pcisig.com/pci/1013/00b8"/>
-      <!-- video: vmvga -->
-      <device id="http://pcisig.com/pci/15ad/0710"/>
-      <!-- video: qxl -->
-      <device id="http://pcisig.com/pci/1b36/0100"/>
-      <!-- network: ne2k_pci-->
-      <device id="http://pcisig.com/pci/10ec/8029"/>
-      <!-- network: pcnet -->
-      <device id="http://pcisig.com/pci/1022/2000"/>
-      <!-- network: rtl8139 -->
-      <device id="http://pcisig.com/pci/10ec/8139"/>
-      <!-- network: e1000 -->
-      <device id="http://pcisig.com/pci/8086/100e"/>
-      <!-- audio: es1370 -->
-      <device id="http://pcisig.com/pci/1274/5000"/>
-      <!-- audio: AC97 -->
-      <device id="http://pcisig.com/pci/8086/2415"/>
-      <!-- audio: ICH6 -->
-      <device id="http://pcisig.com/pci/8086/2668"/>
-      <!-- watchdog devices -->
-      <device id="http://pcisig.com/pci/8086/25ab"/>
-      <device id="http://ibasetechnologies.net/isa/ib700"/>
-      <!-- ps2: keyboard -->
-      <device id="http://ibm.com/ps2/keyboard"/>
-      <!-- ps2: mouse -->
-      <device id="http://ibm.com/ps2/mouse"/>
-      <!-- USB tablet -->
-      <device id="http://usb.org/usb/80ee/0021"/>
-      <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1001"/>
-      <!-- virtio-balloon -->
-      <device id="http://pcisig.com/pci/1af4/1002"/>
-      <!-- virtio-console -->
-      <device id="http://pcisig.com/pci/1af4/1003"/>
-      <!-- virtio-9p -->
-      <device id="http://pcisig.com/pci/1af4/1009"/>
+      <device id="http://pcisig.com/pci/1000/0012"/> <!-- lsi -->
+      <device id="http://pcisig.com/pci/1234/1111"/> <!-- vga -->
+      <device id="http://pcisig.com/pci/1013/00b8"/> <!-- cirrus -->
+      <device id="http://pcisig.com/pci/15ad/0710"/> <!-- vmvga -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
+      <device id="http://pcisig.com/pci/10ec/8029"/> <!-- ne2k_pci -->
+      <device id="http://pcisig.com/pci/1022/2000"/> <!-- pcnet -->
+      <device id="http://pcisig.com/pci/10ec/8139"/> <!-- rtl8139 -->
+      <device id="http://pcisig.com/pci/8086/100e"/> <!-- e1000 -->
+      <device id="http://pcisig.com/pci/1274/5000"/> <!-- es1370 -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 -->
+      <device id="http://pcisig.com/pci/8086/25ab"/> <!-- 6300esb -->
+      <device id="http://ibasetechnologies.net/isa/ib700"/> <!-- ib700 -->
+      <device id="http://ibm.com/ps2/keyboard"/> <!-- keyboard -->
+      <device id="http://ibm.com/ps2/mouse"/> <!-- mouse -->
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
+      <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
     </devices>
   </platform>
 </libosinfo>
diff --git a/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in b/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
index c62c9ce..cf9ff4f 100644
--- a/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
@@ -10,7 +10,7 @@
     <derives-from id="http://xen.org/xen/3.0.3"/>
 
     <devices>
-      <device id="http://xen.org/xen/vfb"/>
+      <device id="http://xen.org/xen/vfb"/> <!-- xen-vfb -->
     </devices>
   </platform>
 </libosinfo>
diff --git a/data/platform/xen.org/xen-3.0.2.xml.in b/data/platform/xen.org/xen-3.0.2.xml.in
index 7c07d64..c3cd208 100644
--- a/data/platform/xen.org/xen-3.0.2.xml.in
+++ b/data/platform/xen.org/xen-3.0.2.xml.in
@@ -8,9 +8,9 @@
     <version>3.0.2</version>
 
     <devices>
-      <device id="http://xen.org/xen/vbd"/>
-      <device id="http://xen.org/xen/vif"/>
-      <device id="http://xen.org/xen/console"/>
+      <device id="http://xen.org/xen/vbd"/> <!-- xen-vbd -->
+      <device id="http://xen.org/xen/vif"/> <!-- xen-vif -->
+      <device id="http://xen.org/xen/console"/> <!-- xen-console -->
     </devices>
   </platform>
 </libosinfo>
diff --git a/data/platform/xen.org/xen-3.0.4.xml.in b/data/platform/xen.org/xen-3.0.4.xml.in
index ff3b1a0..d92e844 100644
--- a/data/platform/xen.org/xen-3.0.4.xml.in
+++ b/data/platform/xen.org/xen-3.0.4.xml.in
@@ -9,7 +9,7 @@
     <upgrades id="http://xen.org/xen/3.0.3"/>
 
     <devices>
-      <device id="http://xen.org/xen/vfb"/>
+      <device id="http://xen.org/xen/vfb"/> <!-- xen-vfb -->
     </devices>
   </platform>
 </libosinfo>
-- 
2.17.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]