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

[virt-tools-list] [libosinfo][PATCH v2 2/7] DB: convert <device> into <product>



and <device-id> into <product-id> as they were mistakenly
switch for the latter and hence not parsed at all.
---
 data/devices/qemu-pci.xml   |   54 +++++++++++++++++++++---------------------
 data/devices/qemu-ps2.xml   |    4 +-
 data/devices/qemu-usb.xml   |    4 +-
 data/devices/virtio-pci.xml |   20 ++++++++--------
 data/schemas/libosinfo.rng  |    4 +-
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/data/devices/qemu-pci.xml b/data/devices/qemu-pci.xml
index 42b041c..b9b21e0 100644
--- a/data/devices/qemu-pci.xml
+++ b/data/devices/qemu-pci.xml
@@ -9,8 +9,8 @@
     <class>block</class>
     <vendor>LSI Logic / Symbios Logic</vendor>
     <vendor-id>1000</vendor-id>
-    <device>53c895a</device>
-    <device-id>0012</device-id>
+    <product>53c895a</product>
+    <product-id>0012</product-id>
   </device>
 
   <!-- Video devices -->
@@ -21,8 +21,8 @@
     <class>video</class>
     <vendor>QEMU</vendor>
     <vendor-id>1234</vendor-id>
-    <device>VGA</device>
-    <device-id>1111</device-id>
+    <product>VGA</product>
+    <product-id>1111</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8";>
@@ -31,8 +31,8 @@
     <class>video</class>
     <vendor>Cirrus Logic</vendor>
     <vendor-id>1013</vendor-id>
-    <device>GD 5446</device>
-    <device-id>00b8</device-id>
+    <product>GD 5446</product>
+    <product-id>00b8</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710";>
@@ -41,8 +41,8 @@
     <class>video</class>
     <vendor>VMWare</vendor>
     <vendor-id>15ad</vendor-id>
-    <device>VGA</device>
-    <device-id>0710</device-id>
+    <product>VGA</product>
+    <product-id>0710</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100";>
@@ -51,8 +51,8 @@
     <class>video</class>
     <vendor>Red Hat, Inc</vendor>
     <vendor-id>1b36</vendor-id>
-    <device>QXL</device>
-    <device-id>0100</device-id>
+    <product>QXL</product>
+    <product-id>0100</product-id>
   </device>
 
 
@@ -63,8 +63,8 @@
     <class>net</class>
     <vendor>Realtek Semiconductor Co., Ltd.</vendor>
     <vendor-id>10ec</vendor-id>
-    <device>RTL-8029(AS)</device>
-    <device-id>8029</device-id>
+    <product>RTL-8029(AS)</product>
+    <product-id>8029</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000";>
@@ -73,8 +73,8 @@
     <class>net</class>
     <vendor>Advanced Micro Devices [AMD]</vendor>
     <vendor-id>1022</vendor-id>
-    <device>79c970 [PCnet32 LANCE]</device>
-    <device-id>2000</device-id>
+    <product>79c970 [PCnet32 LANCE]</product>
+    <product-id>2000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139";>
@@ -83,8 +83,8 @@
     <class>net</class>
     <vendor>Realtek Semiconductor Co., Ltd.</vendor>
     <vendor-id>10ec</vendor-id>
-    <device>RTL-8139/8139C/8139C+</device>
-    <device-id>8139</device-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";>
@@ -92,8 +92,8 @@
     <bus-type>pci</bus-type>
     <vendor>Intel Corporation</vendor>
     <vendor-id>8086</vendor-id>
-    <device>82540EM Gigabit Ethernet Controller</device>
-    <device-id>100e</device-id>
+    <product>82540EM Gigabit Ethernet Controller</product>
+    <product-id>100e</product-id>
   </device>
 
 
@@ -105,8 +105,8 @@
     <class>audio</class>
     <vendor>Ensoniq</vendor>
     <vendor-id>1274</vendor-id>
-    <device>ES1370 [AudioPCI]</device>
-    <device-id>5000</device-id>
+    <product>ES1370 [AudioPCI]</product>
+    <product-id>5000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415";>
@@ -115,8 +115,8 @@
     <class>audio</class>
     <vendor>Intel Corporation</vendor>
     <vendor-id>8086</vendor-id>
-    <device>82801AA AC'97 Audio Controller</device>
-    <device-id>2415</device-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";>
@@ -125,8 +125,8 @@
     <class>audio</class>
     <vendor>Intel Corporation</vendor>
     <vendor-id>8086</vendor-id>
-    <device>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</device>
-    <device-id>2668</device-id>
+    <product>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</product>
+    <product-id>2668</product-id>
   </device>
 
 
@@ -138,15 +138,15 @@
     <class>watchdog</class>
     <vendor>Intel Corporation</vendor>
     <vendor-id>8086</vendor-id>
-    <device>6300ESB Watchdog Timer</device>
-    <device-id>25ab</device-id>
+    <product>6300ESB Watchdog Timer</product>
+    <product-id>25ab</product-id>
   </device>
 
   <device id="isa://ib700">
     <name>ib700</name>
     <bus-type>isa</bus-type>
     <class>watchdog</class>
-    <device>iBASE 700</device>
+    <product>iBASE 700</product>
   </device>
 
 </libosinfo>
diff --git a/data/devices/qemu-ps2.xml b/data/devices/qemu-ps2.xml
index 71f8096..4524b94 100644
--- a/data/devices/qemu-ps2.xml
+++ b/data/devices/qemu-ps2.xml
@@ -6,7 +6,7 @@
     <bus-type>ps2</bus-type>
     <class>input</class>
     <vendor>Qemu/KVM</vendor>
-    <device>Keyboard</device>
+    <product>Keyboard</product>
   </device>
 
   <device id="http://qemu.org/ps2/mouse";>
@@ -14,7 +14,7 @@
     <bus-type>ps2</bus-type>
     <class>input</class>
     <vendor>Qemu/KVM</vendor>
-    <device>Mouse</device>
+    <product>Mouse</product>
   </device>
 
 </libosinfo>
diff --git a/data/devices/qemu-usb.xml b/data/devices/qemu-usb.xml
index 12987ca..34ca07a 100644
--- a/data/devices/qemu-usb.xml
+++ b/data/devices/qemu-usb.xml
@@ -7,8 +7,8 @@
     <class>input</class>
     <vendor>VirtualBox</vendor>
     <vendor-id>80ee</vendor-id>
-    <device>Tablet</device>
-    <device-id>0021</device-id>
+    <product>Tablet</product>
+    <product-id>0021</product-id>
   </device>
 
 </libosinfo>
diff --git a/data/devices/virtio-pci.xml b/data/devices/virtio-pci.xml
index 993435b..b9f4804 100644
--- a/data/devices/virtio-pci.xml
+++ b/data/devices/virtio-pci.xml
@@ -7,8 +7,8 @@
     <class>net</class>
     <vendor>Red Hat, Inc</vendor>
     <vendor-id>1af4</vendor-id>
-    <device>Virtio network device</device>
-    <device-id>1000</device-id>
+    <product>Virtio network device</product>
+    <product-id>1000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001";>
@@ -17,8 +17,8 @@
     <class>block</class>
     <vendor>Red Hat, Inc</vendor>
     <vendor-id>1af4</vendor-id>
-    <device>Virtio block device</device>
-    <device-id>1001</device-id>
+    <product>Virtio block device</product>
+    <product-id>1001</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002";>
@@ -27,8 +27,8 @@
     <class>memory.balloon</class>
     <vendor>Red Hat, Inc</vendor>
     <vendor-id>1af4</vendor-id>
-    <device>Virtio memory balloon</device>
-    <device-id>1002</device-id>
+    <product>Virtio memory balloon</product>
+    <product-id>1002</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003";>
@@ -37,8 +37,8 @@
     <class>console</class>
     <vendor>Red Hat, Inc</vendor>
     <vendor-id>1af4</vendor-id>
-    <device>Virtio console</device>
-    <device-id>1003</device-id>
+    <product>Virtio console</product>
+    <product-id>1003</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009";>
@@ -47,8 +47,8 @@
     <class>filesystem</class>
     <vendor>Red Hat, Inc</vendor>
     <vendor-id>1af4</vendor-id>
-    <device>Virtio 9p</device>
-    <device-id>1009</device-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 e9fe643..3e630af 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -66,12 +66,12 @@
           </element>
         </optional>
         <optional>
-          <element name='device'>
+          <element name='product'>
             <text/>
           </element>
         </optional>
         <optional>
-          <element name='device-id'>
+          <element name='product-id'>
             <ref name='hexid'/>
           </element>
         </optional>
-- 
1.7.8.6


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