Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
configure.ac | 5 ++
data/devices/Makefile.am | 19 ++---
data/devices/ibasetechnologies.net/Makefile.am | 1 +
.../devices/ibasetechnologies.net/isa-ib700.xml.in | 8 ++
data/devices/ibm.com/Makefile.am | 1 +
.../ps2-keyboard.xml.in} | 11 ---
data/devices/ibm.com/ps2-mouse.xml.in | 9 +++
data/devices/pcisig.com/Makefile.am | 1 +
data/devices/pcisig.com/pci-1000-0012.xml.in | 6 ++
data/devices/pcisig.com/pci-1013-00b8.xml.in | 6 ++
data/devices/pcisig.com/pci-1022-2000.xml.in | 6 ++
data/devices/pcisig.com/pci-10ec-8029.xml.in | 6 ++
data/devices/pcisig.com/pci-10ec-8139.xml.in | 6 ++
data/devices/pcisig.com/pci-1234-1111.xml.in | 11 +++
data/devices/pcisig.com/pci-1274-5000.xml.in | 6 ++
data/devices/pcisig.com/pci-15ad-0710.xml.in | 6 ++
data/devices/pcisig.com/pci-1af4-1000.xml.in | 6 ++
data/devices/pcisig.com/pci-1af4-1001.xml.in | 6 ++
data/devices/pcisig.com/pci-1af4-1002.xml.in | 6 ++
data/devices/pcisig.com/pci-1af4-1003.xml.in | 6 ++
data/devices/pcisig.com/pci-1af4-1009.xml.in | 6 ++
data/devices/pcisig.com/pci-1b36-0100.xml.in | 6 ++
data/devices/pcisig.com/pci-8086-100e.xml.in | 6 ++
data/devices/pcisig.com/pci-8086-2415.xml.in | 6 ++
data/devices/pcisig.com/pci-8086-25ab.xml.in | 6 ++
data/devices/pcisig.com/pci-8086-2668.xml.in | 6 ++
data/devices/qemu-pci.xml.in | 93 ----------------------
data/devices/usb.org/Makefile.am | 1 +
.../usb-80ee-0021.xml.in} | 3 -
data/devices/virtio-pci.xml.in | 29 -------
data/devices/xen.org/Makefile.am | 1 +
data/devices/xen.org/xen-console.xml.in | 9 +++
data/devices/xen.org/xen-pci.xml.in | 9 +++
data/devices/xen.org/xen-vbd.xml.in | 9 +++
data/devices/xen.org/xen-vfb.xml.in | 9 +++
data/devices/xen.org/xen-vif.xml.in | 9 +++
data/devices/xen.org/xen-vkbd.xml.in | 9 +++
data/devices/xen.org/xen-vscsi.xml.in | 9 +++
data/devices/xen.org/xen-vtpm.xml.in | 8 ++
data/devices/xen.xml.in | 75 -----------------
po/POTFILES.in | 7 +-
41 files changed, 220 insertions(+), 228 deletions(-)
create mode 100644 data/devices/ibasetechnologies.net/Makefile.am
create mode 100644 data/devices/ibasetechnologies.net/isa-ib700.xml.in
create mode 100644 data/devices/ibm.com/Makefile.am
rename data/devices/{qemu-ps2.xml.in => ibm.com/ps2-keyboard.xml.in} (51%)
create mode 100644 data/devices/ibm.com/ps2-mouse.xml.in
create mode 100644 data/devices/pcisig.com/Makefile.am
create mode 100644 data/devices/pcisig.com/pci-1000-0012.xml.in
create mode 100644 data/devices/pcisig.com/pci-1013-00b8.xml.in
create mode 100644 data/devices/pcisig.com/pci-1022-2000.xml.in
create mode 100644 data/devices/pcisig.com/pci-10ec-8029.xml.in
create mode 100644 data/devices/pcisig.com/pci-10ec-8139.xml.in
create mode 100644 data/devices/pcisig.com/pci-1234-1111.xml.in
create mode 100644 data/devices/pcisig.com/pci-1274-5000.xml.in
create mode 100644 data/devices/pcisig.com/pci-15ad-0710.xml.in
create mode 100644 data/devices/pcisig.com/pci-1af4-1000.xml.in
create mode 100644 data/devices/pcisig.com/pci-1af4-1001.xml.in
create mode 100644 data/devices/pcisig.com/pci-1af4-1002.xml.in
create mode 100644 data/devices/pcisig.com/pci-1af4-1003.xml.in
create mode 100644 data/devices/pcisig.com/pci-1af4-1009.xml.in
create mode 100644 data/devices/pcisig.com/pci-1b36-0100.xml.in
create mode 100644 data/devices/pcisig.com/pci-8086-100e.xml.in
create mode 100644 data/devices/pcisig.com/pci-8086-2415.xml.in
create mode 100644 data/devices/pcisig.com/pci-8086-25ab.xml.in
create mode 100644 data/devices/pcisig.com/pci-8086-2668.xml.in
delete mode 100644 data/devices/qemu-pci.xml.in
create mode 100644 data/devices/usb.org/Makefile.am
rename data/devices/{qemu-usb.xml.in => usb.org/usb-80ee-0021.xml.in} (75%)
delete mode 100644 data/devices/virtio-pci.xml.in
create mode 100644 data/devices/xen.org/Makefile.am
create mode 100644 data/devices/xen.org/xen-console.xml.in
create mode 100644 data/devices/xen.org/xen-pci.xml.in
create mode 100644 data/devices/xen.org/xen-vbd.xml.in
create mode 100644 data/devices/xen.org/xen-vfb.xml.in
create mode 100644 data/devices/xen.org/xen-vif.xml.in
create mode 100644 data/devices/xen.org/xen-vkbd.xml.in
create mode 100644 data/devices/xen.org/xen-vscsi.xml.in
create mode 100644 data/devices/xen.org/xen-vtpm.xml.in
delete mode 100644 data/devices/xen.xml.in
diff --git a/configure.ac b/configure.ac
index 6dab007..2af5e07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,11 @@ AC_CONFIG_FILES([
data/datamaps/microsoft.com/Makefile
data/datamaps/x.org/Makefile
data/devices/Makefile
+ data/devices/ibasetechnologies.net/Makefile
+ data/devices/ibm.com/Makefile
+ data/devices/pcisig.com/Makefile
+ data/devices/usb.org/Makefile
+ data/devices/xen.org/Makefile
data/platforms/Makefile
data/platforms/linux-kvm.org/Makefile
data/platforms/qemu.org/Makefile
diff --git a/data/devices/Makefile.am b/data/devices/Makefile.am
index 35aa20c..fecd33d 100644
--- a/data/devices/Makefile.am
+++ b/data/devices/Makefile.am
@@ -1,15 +1,8 @@
-databasedir = $(pkgdatadir)/db/devices/
-database_in_files = \
- xen.xml.in \
- qemu-pci.xml.in \
- qemu-usb.xml.in \
- qemu-ps2.xml.in \
- virtio-pci.xml.in
+SUBDIRS = \
+ ibasetechnologies.net \
+ ibm.com \
+ pcisig.com \
+ usb.org \
+ xen.org \
$(NULL)
-
-database_DATA = $(database_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/devices/ibasetechnologies.net/Makefile.am b/data/devices/ibasetechnologies.net/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/ibasetechnologies.net/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/ibasetechnologies.net/isa-ib700.xml.in b/data/devices/ibasetechnologies.net/isa-ib700.xml.in
new file mode 100644
index 0000000..b629715
--- /dev/null
+++ b/data/devices/ibasetechnologies.net/isa-ib700.xml.in
@@ -0,0 +1,8 @@
+<libosinfo version="0.0.1">
+ <device id="http://ibasetechnologies.net/isa/ib700";>
+ <name>ib700</name>
+ <bus-type>isa</bus-type>
+ <class>watchdog</class>
+ <product>iBASE 700</product>
+ </device>
+</libosinfo>
diff --git a/data/devices/ibm.com/Makefile.am b/data/devices/ibm.com/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/ibm.com/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/qemu-ps2.xml.in b/data/devices/ibm.com/ps2-keyboard.xml.in
similarity index 51%
rename from data/devices/qemu-ps2.xml.in
rename to data/devices/ibm.com/ps2-keyboard.xml.in
index cef68e2..c66a4e3 100644
--- a/data/devices/qemu-ps2.xml.in
+++ b/data/devices/ibm.com/ps2-keyboard.xml.in
@@ -1,6 +1,4 @@
-<!-- PS2 devices for QEMU/KVM(s) -->
<libosinfo version="0.0.1">
-
<device id="http://ibm.com/ps2/keyboard";>
<name>keyboard</name>
<bus-type>ps2</bus-type>
@@ -8,13 +6,4 @@
<_vendor>Qemu/KVM</_vendor>
<product>Keyboard</product>
</device>
-
- <device id="http://ibm.com/ps2/mouse";>
- <name>mouse</name>
- <bus-type>ps2</bus-type>
- <class>input</class>
- <_vendor>Qemu/KVM</_vendor>
- <product>Mouse</product>
- </device>
-
</libosinfo>
diff --git a/data/devices/ibm.com/ps2-mouse.xml.in b/data/devices/ibm.com/ps2-mouse.xml.in
new file mode 100644
index 0000000..18ebd3e
--- /dev/null
+++ b/data/devices/ibm.com/ps2-mouse.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://ibm.com/ps2/mouse";>
+ <name>mouse</name>
+ <bus-type>ps2</bus-type>
+ <class>input</class>
+ <_vendor>Qemu/KVM</_vendor>
+ <product>Mouse</product>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/Makefile.am b/data/devices/pcisig.com/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/pcisig.com/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/pcisig.com/pci-1000-0012.xml.in b/data/devices/pcisig.com/pci-1000-0012.xml.in
new file mode 100644
index 0000000..841d32b
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1000-0012.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1000/0012";>
+ <name>lsi</name>
+ <class>block</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1013-00b8.xml.in b/data/devices/pcisig.com/pci-1013-00b8.xml.in
new file mode 100644
index 0000000..53a44bf
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1013-00b8.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1013/00b8";>
+ <name>cirrus</name>
+ <class>video</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1022-2000.xml.in b/data/devices/pcisig.com/pci-1022-2000.xml.in
new file mode 100644
index 0000000..8f51e0f
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1022-2000.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1022/2000";>
+ <name>pcnet</name>
+ <class>net</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-10ec-8029.xml.in b/data/devices/pcisig.com/pci-10ec-8029.xml.in
new file mode 100644
index 0000000..1030cd3
--- /dev/null
+++ b/data/devices/pcisig.com/pci-10ec-8029.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/10ec/8029";>
+ <name>ne2k_pci</name>
+ <class>net</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-10ec-8139.xml.in b/data/devices/pcisig.com/pci-10ec-8139.xml.in
new file mode 100644
index 0000000..636d136
--- /dev/null
+++ b/data/devices/pcisig.com/pci-10ec-8139.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/10ec/8139";>
+ <name>rtl8139</name>
+ <class>net</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1234-1111.xml.in b/data/devices/pcisig.com/pci-1234-1111.xml.in
new file mode 100644
index 0000000..a813e68
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1234-1111.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1234/1111";>
+ <name>vga</name>
+ <bus-type>pci</bus-type>
+ <class>video</class>
+ <_vendor>QEMU</_vendor>
+ <vendor-id>1234</vendor-id>
+ <product>VGA</product>
+ <product-id>1111</product-id>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1274-5000.xml.in b/data/devices/pcisig.com/pci-1274-5000.xml.in
new file mode 100644
index 0000000..c6e6a04
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1274-5000.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1274/5000";>
+ <name>es1370</name>
+ <class>audio</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-15ad-0710.xml.in b/data/devices/pcisig.com/pci-15ad-0710.xml.in
new file mode 100644
index 0000000..2f2de24
--- /dev/null
+++ b/data/devices/pcisig.com/pci-15ad-0710.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/15ad/0710";>
+ <name>vmvga</name>
+ <class>video</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1af4-1000.xml.in b/data/devices/pcisig.com/pci-1af4-1000.xml.in
new file mode 100644
index 0000000..cd864e8
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1af4-1000.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1af4/1000";>
+ <name>virtio-net</name>
+ <class>net</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1af4-1001.xml.in b/data/devices/pcisig.com/pci-1af4-1001.xml.in
new file mode 100644
index 0000000..f58b07a
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1af4-1001.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1af4/1001";>
+ <name>virtio-block</name>
+ <class>block</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1af4-1002.xml.in b/data/devices/pcisig.com/pci-1af4-1002.xml.in
new file mode 100644
index 0000000..3273235
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1af4-1002.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1af4/1002";>
+ <name>virtio-balloon</name>
+ <class>memory.balloon</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1af4-1003.xml.in b/data/devices/pcisig.com/pci-1af4-1003.xml.in
new file mode 100644
index 0000000..68ee16e
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1af4-1003.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1af4/1003";>
+ <name>virtio-console</name>
+ <class>console</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1af4-1009.xml.in b/data/devices/pcisig.com/pci-1af4-1009.xml.in
new file mode 100644
index 0000000..bbb89fe
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1af4-1009.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1af4/1009";>
+ <name>virtio-9p</name>
+ <class>filesystem</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-1b36-0100.xml.in b/data/devices/pcisig.com/pci-1b36-0100.xml.in
new file mode 100644
index 0000000..4405392
--- /dev/null
+++ b/data/devices/pcisig.com/pci-1b36-0100.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/1b36/0100";>
+ <name>qxl</name>
+ <class>video</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-8086-100e.xml.in b/data/devices/pcisig.com/pci-8086-100e.xml.in
new file mode 100644
index 0000000..fa9ab06
--- /dev/null
+++ b/data/devices/pcisig.com/pci-8086-100e.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/8086/100e";>
+ <name>e1000</name>
+ <class>net</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-8086-2415.xml.in b/data/devices/pcisig.com/pci-8086-2415.xml.in
new file mode 100644
index 0000000..b873efc
--- /dev/null
+++ b/data/devices/pcisig.com/pci-8086-2415.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/8086/2415";>
+ <name>ac97</name>
+ <class>audio</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-8086-25ab.xml.in b/data/devices/pcisig.com/pci-8086-25ab.xml.in
new file mode 100644
index 0000000..86df550
--- /dev/null
+++ b/data/devices/pcisig.com/pci-8086-25ab.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/8086/25ab";>
+ <name>6300esb</name>
+ <class>watchdog</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/pcisig.com/pci-8086-2668.xml.in b/data/devices/pcisig.com/pci-8086-2668.xml.in
new file mode 100644
index 0000000..5eedce4
--- /dev/null
+++ b/data/devices/pcisig.com/pci-8086-2668.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+ <device id="http://pcisig.com/pci/8086/2668";>
+ <name>ich6</name>
+ <class>audio</class>
+ </device>
+</libosinfo>
diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
deleted file mode 100644
index 89fa8a4..0000000
--- a/data/devices/qemu-pci.xml.in
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- PCI devices from various QEMU/KVM(s) -->
-<libosinfo version="0.0.1">
-
- <!-- Block devices -->
-
- <device id="http://pcisig.com/pci/1000/0012";>
- <name>lsi</name>
- <class>block</class>
- </device>
-
- <!-- Video devices -->
-
- <device id="http://pcisig.com/pci/1234/1111";>
- <name>vga</name>
- <bus-type>pci</bus-type>
- <class>video</class>
- <_vendor>QEMU</_vendor>
- <vendor-id>1234</vendor-id>
- <product>VGA</product>
- <product-id>1111</product-id>
- </device>
-
- <device id="http://pcisig.com/pci/1013/00b8";>
- <name>cirrus</name>
- <class>video</class>
- </device>
-
- <device id="http://pcisig.com/pci/15ad/0710";>
- <name>vmvga</name>
- <class>video</class>
- </device>
-
- <device id="http://pcisig.com/pci/1b36/0100";>
- <name>qxl</name>
- <class>video</class>
- </device>
-
-
- <!-- Network devices -->
- <device id="http://pcisig.com/pci/10ec/8029";>
- <name>ne2k_pci</name>
- <class>net</class>
- </device>
-
- <device id="http://pcisig.com/pci/1022/2000";>
- <name>pcnet</name>
- <class>net</class>
- </device>
-
- <device id="http://pcisig.com/pci/10ec/8139";>
- <name>rtl8139</name>
- <class>net</class>
- </device>
-
- <device id="http://pcisig.com/pci/8086/100e";>
- <name>e1000</name>
- <class>net</class>
- </device>
-
-
- <!-- Audio devices -->
-
- <device id="http://pcisig.com/pci/1274/5000";>
- <name>es1370</name>
- <class>audio</class>
- </device>
-
- <device id="http://pcisig.com/pci/8086/2415";>
- <name>ac97</name>
- <class>audio</class>
- </device>
-
- <device id="http://pcisig.com/pci/8086/2668";>
- <name>ich6</name>
- <class>audio</class>
- </device>
-
-
- <!-- Watchdog devices -->
-
- <device id="http://pcisig.com/pci/8086/25ab";>
- <name>6300esb</name>
- <class>watchdog</class>
- </device>
-
- <device id="http://ibasetechnologies.net/isa/ib700";>
- <name>ib700</name>
- <bus-type>isa</bus-type>
- <class>watchdog</class>
- <product>iBASE 700</product>
- </device>
-
-</libosinfo>
diff --git a/data/devices/usb.org/Makefile.am b/data/devices/usb.org/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/usb.org/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/qemu-usb.xml.in b/data/devices/usb.org/usb-80ee-0021.xml.in
similarity index 75%
rename from data/devices/qemu-usb.xml.in
rename to data/devices/usb.org/usb-80ee-0021.xml.in
index 7815ca8..2a9762a 100644
--- a/data/devices/qemu-usb.xml.in
+++ b/data/devices/usb.org/usb-80ee-0021.xml.in
@@ -1,9 +1,6 @@
-<!-- USB devices from various QEMU/KVM(s) -->
<libosinfo version="0.0.1">
-
<device id="http://usb.org/usb/80ee/0021";>
<name>tablet</name>
<class>input</class>
</device>
-
</libosinfo>
diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in
deleted file mode 100644
index 5ad58df..0000000
--- a/data/devices/virtio-pci.xml.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- VirtIO PCI devices -->
-<libosinfo version="0.0.1">
-
- <device id="http://pcisig.com/pci/1af4/1000";>
- <name>virtio-net</name>
- <class>net</class>
- </device>
-
- <device id="http://pcisig.com/pci/1af4/1001";>
- <name>virtio-block</name>
- <class>block</class>
- </device>
-
- <device id="http://pcisig.com/pci/1af4/1002";>
- <name>virtio-balloon</name>
- <class>memory.balloon</class>
- </device>
-
- <device id="http://pcisig.com/pci/1af4/1003";>
- <name>virtio-console</name>
- <class>console</class>
- </device>
-
- <device id="http://pcisig.com/pci/1af4/1009";>
- <name>virtio-9p</name>
- <class>filesystem</class>
- </device>
-
-</libosinfo>
diff --git a/data/devices/xen.org/Makefile.am b/data/devices/xen.org/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/xen.org/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/xen.org/xen-console.xml.in b/data/devices/xen.org/xen-console.xml.in
new file mode 100644
index 0000000..caed5c4
--- /dev/null
+++ b/data/devices/xen.org/xen-console.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/console";>
+ <class>console</class>
+ <bus-type>xen</bus-type>
+ <product>Virtual Console</product>
+ <product-id>console</product-id>
+ <name>xen-console</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.org/xen-pci.xml.in b/data/devices/xen.org/xen-pci.xml.in
new file mode 100644
index 0000000..f7e0064
--- /dev/null
+++ b/data/devices/xen.org/xen-pci.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/pci";>
+ <class>input</class>
+ <bus-type>xen</bus-type>
+ <product>Virtual PCI</product>
+ <product-id>pci</product-id>
+ <name>xen-pci</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.org/xen-vbd.xml.in b/data/devices/xen.org/xen-vbd.xml.in
new file mode 100644
index 0000000..fe3fadc
--- /dev/null
+++ b/data/devices/xen.org/xen-vbd.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/vbd";>
+ <class>block</class>
+ <bus-type>xen</bus-type>
+ <product>Virtual Block Device</product>
+ <product-id>vbd</product-id>
+ <name>xen-vbd</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.org/xen-vfb.xml.in b/data/devices/xen.org/xen-vfb.xml.in
new file mode 100644
index 0000000..5fd1ea2
--- /dev/null
+++ b/data/devices/xen.org/xen-vfb.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/vfb";>
+ <class>video</class>
+ <bus-type>xen</bus-type>
+ <product>Virtual FrameBuffer</product>
+ <product-id>vfb</product-id>
+ <name>xen-vfb</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.org/xen-vif.xml.in b/data/devices/xen.org/xen-vif.xml.in
new file mode 100644
index 0000000..88368ca
--- /dev/null
+++ b/data/devices/xen.org/xen-vif.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/vif";>
+ <class>net</class>
+ <bus-type>xen</bus-type>
+ <product>Virtual Interface</product>
+ <product-id>vif</product-id>
+ <name>xen-vif</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.org/xen-vkbd.xml.in b/data/devices/xen.org/xen-vkbd.xml.in
new file mode 100644
index 0000000..dc06da9
--- /dev/null
+++ b/data/devices/xen.org/xen-vkbd.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/vkbd";>
+ <class>input</class>
+ <bus-type>xen</bus-type>
+ <product>Virtual Keyboard</product>
+ <product-id>vkbd</product-id>
+ <name>xen-vkbd</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.org/xen-vscsi.xml.in b/data/devices/xen.org/xen-vscsi.xml.in
new file mode 100644
index 0000000..a8a9036
--- /dev/null
+++ b/data/devices/xen.org/xen-vscsi.xml.in
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/vscsi";>
+ <class>block</class>
+ <bus-type>xen</bus-type>
+ <product>Virtual SCSI</product>
+ <product-id>vscsi</product-id>
+ <name>xen-vscsi</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.org/xen-vtpm.xml.in b/data/devices/xen.org/xen-vtpm.xml.in
new file mode 100644
index 0000000..a29bd7a
--- /dev/null
+++ b/data/devices/xen.org/xen-vtpm.xml.in
@@ -0,0 +1,8 @@
+<libosinfo version="0.0.1">
+ <device id="http://xen.org/xen/vtpm";>
+ <bus-type>xen</bus-type>
+ <product>Virtual TPM</product>
+ <product-id>vtpm</product-id>
+ <name>xen-vtpm</name>
+ </device>
+</libosinfo>
diff --git a/data/devices/xen.xml.in b/data/devices/xen.xml.in
deleted file mode 100644
index d484ac1..0000000
--- a/data/devices/xen.xml.in
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- Xen 3.x / 4.x paravirt devices -->
-<libosinfo version="0.0.1">
-
- <device id="http://xen.org/xen/vbd";>
- <class>block</class>
- <bus-type>xen</bus-type>
- <product>Virtual Block Device</product>
- <product-id>vbd</product-id>
- <name>xen-vbd</name>
- </device>
-
- <device id="http://xen.org/xen/vscsi";>
- <class>block</class>
- <bus-type>xen</bus-type>
- <product>Virtual SCSI</product>
- <product-id>vscsi</product-id>
- <name>xen-vscsi</name>
- </device>
-
- <device id="http://xen.org/xen/vif";>
- <class>net</class>
- <bus-type>xen</bus-type>
- <product>Virtual Interface</product>
- <product-id>vif</product-id>
- <name>xen-vif</name>
- </device>
-
- <device id="http://xen.org/xen/console";>
- <class>console</class>
- <bus-type>xen</bus-type>
- <product>Virtual Console</product>
- <product-id>console</product-id>
- <name>xen-console</name>
- </device>
-
- <device id="http://xen.org/xen/vfb";>
- <class>video</class>
- <bus-type>xen</bus-type>
- <product>Virtual FrameBuffer</product>
- <product-id>vfb</product-id>
- <name>xen-vfb</name>
- </device>
-
- <device id="http://xen.org/xen/vtpm";>
- <bus-type>xen</bus-type>
- <product>Virtual TPM</product>
- <product-id>vtpm</product-id>
- <name>xen-vtpm</name>
- </device>
-
- <device id="http://xen.org/xen/vkbd";>
- <class>input</class>
- <bus-type>xen</bus-type>
- <product>Virtual Keyboard</product>
- <product-id>vkbd</product-id>
- <name>xen-vkbd</name>
- </device>
-
- <device id="http://xen.org/xen/vkbd";>
- <class>input</class>
- <bus-type>xen</bus-type>
- <product>Virtual Keyboard</product>
- <product-id>vkbd</product-id>
- <name>xen-vkbd</name>
- </device>
-
- <device id="http://xen.org/xen/pci";>
- <class>input</class>
- <bus-type>xen</bus-type>
- <product>Virtual PCI</product>
- <product-id>pci</product-id>
- <name>xen-pci</name>
- </device>
-
-</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 874922b..da70e2b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -330,10 +330,6 @@ data/oses/ubuntu.com/ubuntu-14.04.xml.in
data/oses/ubuntu.com/ubuntu-14.10.xml.in
data/oses/ubuntu.com/ubuntu-15.04.xml.in
data/oses/ubuntu.com/ubuntu-15.10.xml.in
-data/devices/qemu-ps2.xml.in
-data/devices/qemu-pci.xml.in
-data/devices/virtio-pci.xml.in
-data/devices/qemu-usb.xml.in
data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in
data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in
data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in
@@ -402,6 +398,9 @@ data/platforms/xen.org/xen-3.4.3.xml.in
data/platforms/xen.org/xen-4.0.0.xml.in
data/platforms/xen.org/xen-4.0.1.xml.in
data/platforms/xen.org/xen-4.1.0.xml.in
+data/devices/ibm.com/ps2-keyboard.xml.in
+data/devices/ibm.com/ps2-mouse.xml.in
+data/devices/pcisig.com/pci-1234-1111.xml.in
osinfo/osinfo_avatar_format.c
osinfo/osinfo_deployment.c
osinfo/osinfo_devicelink.c
--
2.4.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
