[Libosinfo] [PATCH v2 03/52] data: remove most information about PCI devices

Daniel P. Berrange berrange at redhat.com
Mon Oct 5 15:31:07 UTC 2015


We already load PCI/USB information from the pci.ids/usb.ids
files, so should not duplicate it again in XML files. The
only info we need to retain are the device classes.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 data/devices/qemu-pci.xml.in   | 61 +-----------------------------------------
 data/devices/qemu-usb.xml.in   |  5 ----
 data/devices/virtio-pci.xml.in | 25 -----------------
 data/schemas/libosinfo.rng     | 24 +++++++++--------
 4 files changed, 14 insertions(+), 101 deletions(-)

diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
index 0d0fbc9..e880434 100644
--- a/data/devices/qemu-pci.xml.in
+++ b/data/devices/qemu-pci.xml.in
@@ -5,12 +5,7 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012">
     <name>lsi</name>
-    <bus-type>pci</bus-type>
     <class>block</class>
-    <_vendor>LSI Logic / Symbios Logic</_vendor>
-    <vendor-id>1000</vendor-id>
-    <product>53c895a</product>
-    <product-id>0012</product-id>
   </device>
 
   <!-- Video devices -->
@@ -27,73 +22,39 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8">
     <name>cirrus</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>Cirrus Logic</_vendor>
-    <vendor-id>1013</vendor-id>
-    <product>GD 5446</product>
-    <product-id>00b8</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710">
     <name>vmvga</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>VMWare</_vendor>
-    <vendor-id>15ad</vendor-id>
-    <product>VGA</product>
-    <product-id>0710</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100">
     <name>qxl</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1b36</vendor-id>
-    <product>QXL</product>
-    <product-id>0100</product-id>
   </device>
 
 
   <!-- Network devices -->
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029">
     <name>ne2k_pci</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8029(AS)</product>
-    <product-id>8029</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000">
     <name>pcnet</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Advanced Micro Devices [AMD]</_vendor>
-    <vendor-id>1022</vendor-id>
-    <product>79c970 [PCnet32 LANCE]</product>
-    <product-id>2000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139">
     <name>rtl8139</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8139/8139C/8139C+</product>
-    <product-id>8139</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e">
     <name>e1000</name>
-    <bus-type>pci</bus-type>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82540EM Gigabit Ethernet Controller</product>
-    <product-id>100e</product-id>
+    <class>net</class>
   </device>
 
 
@@ -101,32 +62,17 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000">
     <name>es1370</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Ensoniq</_vendor>
-    <vendor-id>1274</vendor-id>
-    <product>ES1370 [AudioPCI]</product>
-    <product-id>5000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415">
     <name>ac97</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801AA AC'97 Audio Controller</product>
-    <product-id>2415</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668">
     <name>ich6</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</product>
-    <product-id>2668</product-id>
   </device>
 
 
@@ -134,12 +80,7 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab">
     <name>6300esb</name>
-    <bus-type>pci</bus-type>
     <class>watchdog</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>6300ESB Watchdog Timer</product>
-    <product-id>25ab</product-id>
   </device>
 
   <device id="isa://ib700">
diff --git a/data/devices/qemu-usb.xml.in b/data/devices/qemu-usb.xml.in
index 213187f..9719661 100644
--- a/data/devices/qemu-usb.xml.in
+++ b/data/devices/qemu-usb.xml.in
@@ -3,12 +3,7 @@
 
   <device id="http://www.linux-usb.org/usb.ids/80ee/0021">
     <name>tablet</name>
-    <bus-type>usb</bus-type>
     <class>input</class>
-    <_vendor>VirtualBox</_vendor>
-    <vendor-id>80ee</vendor-id>
-    <product>Tablet</product>
-    <product-id>0021</product-id>
   </device>
 
 </libosinfo>
diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in
index b5b3948..ccc32da 100644
--- a/data/devices/virtio-pci.xml.in
+++ b/data/devices/virtio-pci.xml.in
@@ -3,52 +3,27 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000">
     <name>virtio-net</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio network device</product>
-    <product-id>1000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001">
     <name>virtio-block</name>
-    <bus-type>pci</bus-type>
     <class>block</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio block device</product>
-    <product-id>1001</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002">
     <name>virtio-balloon</name>
-    <bus-type>pci</bus-type>
     <class>memory.balloon</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio memory balloon</product>
-    <product-id>1002</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003">
     <name>virtio-console</name>
-    <bus-type>pci</bus-type>
     <class>console</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio console</product>
-    <product-id>1003</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009">
     <name>virtio-9p</name>
-    <bus-type>pci</bus-type>
     <class>filesystem</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio 9p</product>
-    <product-id>1009</product-id>
   </device>
 
 </libosinfo>
diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index b23d210..b36eef0 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -58,17 +58,19 @@
             <text/>
           </element>
         </oneOrMore>
-        <element name='bus-type'>
-          <choice>
-            <value>isa</value>
-            <value>pci</value>
-            <value>usb</value>
-            <value>xen</value>
-            <value>ps2</value>
-            <value>ide</value>
-            <value>virtio</value>
-          </choice>
-        </element>
+        <optional>
+          <element name='bus-type'>
+            <choice>
+              <value>isa</value>
+              <value>pci</value>
+              <value>usb</value>
+              <value>xen</value>
+              <value>ps2</value>
+              <value>ide</value>
+              <value>virtio</value>
+            </choice>
+          </element>
+        </optional>
         <optional>
           <element name='class'>
             <choice>
-- 
2.4.3




More information about the Libosinfo mailing list