Currently PCI and USB device URIs look like http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668 http://www.linux-usb.org/usb.ids/80ee/0021 We want to associate filenames with URIs in a well-defined format. These existing URIs, particular the PCI one, are too long in the path component. It is also desirable to use the industry standards body as the domain name, rather than the domain of the specific project we happen to import data from right now. Thus the URIs are changed to http://pcisig.com/pci/1af4/1000 http://usb.org/usb/80ee/0021 Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- data/devices/qemu-pci.xml.in | 26 +++++++-------- data/devices/qemu-usb.xml.in | 2 +- data/devices/virtio-pci.xml.in | 10 +++--- data/hypervisors/qemu.xml.in | 38 +++++++++++----------- data/oses/altlinux.xml.in | 6 ++-- data/oses/debian.xml.in | 10 +++--- data/oses/fedora.xml.in | 12 +++---- data/oses/freebsd.xml.in | 12 +++---- data/oses/gnome.xml.in | 10 +++--- data/oses/mandriva.xml.in | 8 ++--- data/oses/openbsd.xml.in | 6 ++-- data/oses/rhel.xml.in | 30 +++++++++--------- data/oses/solaris.xml.in | 4 +-- data/oses/suse.xml.in | 4 +-- data/oses/ubuntu.xml.in | 4 +-- data/oses/windows.xml.in | 72 +++++++++++++++++++++--------------------- osinfo/osinfo_loader.c | 8 ++--- 17 files changed, 131 insertions(+), 131 deletions(-) diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in index e880434..3e1ab5d 100644 --- a/data/devices/qemu-pci.xml.in +++ b/data/devices/qemu-pci.xml.in @@ -3,14 +3,14 @@ <!-- Block devices --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012";> + <device id="http://pcisig.com/pci/1000/0012";> <name>lsi</name> <class>block</class> </device> <!-- Video devices --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111";> + <device id="http://pcisig.com/pci/1234/1111";> <name>vga</name> <bus-type>pci</bus-type> <class>video</class> @@ -20,39 +20,39 @@ <product-id>1111</product-id> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8";> + <device id="http://pcisig.com/pci/1013/00b8";> <name>cirrus</name> <class>video</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710";> + <device id="http://pcisig.com/pci/15ad/0710";> <name>vmvga</name> <class>video</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100";> + <device id="http://pcisig.com/pci/1b36/0100";> <name>qxl</name> <class>video</class> </device> <!-- Network devices --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029";> + <device id="http://pcisig.com/pci/10ec/8029";> <name>ne2k_pci</name> <class>net</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000";> + <device id="http://pcisig.com/pci/1022/2000";> <name>pcnet</name> <class>net</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139";> + <device id="http://pcisig.com/pci/10ec/8139";> <name>rtl8139</name> <class>net</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e";> + <device id="http://pcisig.com/pci/8086/100e";> <name>e1000</name> <class>net</class> </device> @@ -60,17 +60,17 @@ <!-- Audio devices --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000";> + <device id="http://pcisig.com/pci/1274/5000";> <name>es1370</name> <class>audio</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415";> + <device id="http://pcisig.com/pci/8086/2415";> <name>ac97</name> <class>audio</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668";> + <device id="http://pcisig.com/pci/8086/2668";> <name>ich6</name> <class>audio</class> </device> @@ -78,7 +78,7 @@ <!-- Watchdog devices --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab";> + <device id="http://pcisig.com/pci/8086/25ab";> <name>6300esb</name> <class>watchdog</class> </device> diff --git a/data/devices/qemu-usb.xml.in b/data/devices/qemu-usb.xml.in index 9719661..7815ca8 100644 --- a/data/devices/qemu-usb.xml.in +++ b/data/devices/qemu-usb.xml.in @@ -1,7 +1,7 @@ <!-- USB devices from various QEMU/KVM(s) --> <libosinfo version="0.0.1"> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021";> + <device id="http://usb.org/usb/80ee/0021";> <name>tablet</name> <class>input</class> </device> diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in index ccc32da..5ad58df 100644 --- a/data/devices/virtio-pci.xml.in +++ b/data/devices/virtio-pci.xml.in @@ -1,27 +1,27 @@ <!-- VirtIO PCI devices --> <libosinfo version="0.0.1"> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000";> + <device id="http://pcisig.com/pci/1af4/1000";> <name>virtio-net</name> <class>net</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001";> + <device id="http://pcisig.com/pci/1af4/1001";> <name>virtio-block</name> <class>block</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002";> + <device id="http://pcisig.com/pci/1af4/1002";> <name>virtio-balloon</name> <class>memory.balloon</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003";> + <device id="http://pcisig.com/pci/1af4/1003";> <name>virtio-console</name> <class>console</class> </device> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009";> + <device id="http://pcisig.com/pci/1af4/1009";> <name>virtio-9p</name> <class>filesystem</class> </device> diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in index 8fa2e0b..9523758 100644 --- a/data/hypervisors/qemu.xml.in +++ b/data/hypervisors/qemu.xml.in @@ -10,48 +10,48 @@ <devices> <!-- block: LSI --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012"/> + <device id="http://pcisig.com/pci/1000/0012"/> <!-- video: vga --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> + <device id="http://pcisig.com/pci/1234/1111"/> <!-- video: cirrus --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8"/> + <device id="http://pcisig.com/pci/1013/00b8"/> <!-- video: vmvga --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710"/> + <device id="http://pcisig.com/pci/15ad/0710"/> <!-- video: qxl --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> + <device id="http://pcisig.com/pci/1b36/0100"/> <!-- network: ne2k_pci--> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/> + <device id="http://pcisig.com/pci/10ec/8029"/> <!-- network: pcnet --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/> + <device id="http://pcisig.com/pci/1022/2000"/> <!-- network: rtl8139 --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139"/> + <device id="http://pcisig.com/pci/10ec/8139"/> <!-- network: e1000 --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/> + <device id="http://pcisig.com/pci/8086/100e"/> <!-- audio: es1370 --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000"/> + <device id="http://pcisig.com/pci/1274/5000"/> <!-- audio: AC97 --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> + <device id="http://pcisig.com/pci/8086/2415"/> <!-- audio: ICH6 --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- watchdog devices --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/> + <device id="http://pcisig.com/pci/8086/25ab"/> <device id="isa://ib700"/> <!-- ps2: keyboard --> <device id="http://qemu.org/ps2/keyboard"/> <!-- ps2: mouse --> <device id="http://qemu.org/ps2/mouse"/> <!-- USB tablet --> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> + <device id="http://usb.org/usb/80ee/0021"/> <!-- virtio-net --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-block --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-balloon --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/> + <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-console --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/> + <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-9p --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009"/> + <device id="http://pcisig.com/pci/1af4/1009"/> </devices> </platform> diff --git a/data/oses/altlinux.xml.in b/data/oses/altlinux.xml.in index 9e6df02..704b338 100644 --- a/data/oses/altlinux.xml.in +++ b/data/oses/altlinux.xml.in @@ -160,8 +160,8 @@ <release-date>2009-10-29</release-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </devices> <media arch="i686"> @@ -208,7 +208,7 @@ <release-date>2011-10-26</release-date> <devices> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> + <device id="http://usb.org/usb/80ee/0021"/> </devices> <media arch="i686"> diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index 0e14568..57b3bd9 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -119,8 +119,8 @@ <derives-from id="http://debian.org/debian/4"/> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </devices> <resources arch="all"> @@ -150,7 +150,7 @@ <derives-from id="http://debian.org/debian/5"/> <devices> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> + <device id="http://usb.org/usb/80ee/0021"/> </devices> <resources arch="all"> @@ -220,7 +220,7 @@ <derives-from id="http://debian.org/debian/6"/> <devices> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB Tablet --> + <device id="http://usb.org/usb/80ee/0021"/> <!-- USB Tablet --> </devices> <resources arch="all"> @@ -272,7 +272,7 @@ <derives-from id="http://debian.org/debian/7"/> <devices> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB Tablet --> + <device id="http://usb.org/usb/80ee/0021"/> <!-- USB Tablet --> </devices> <resources arch="all"> diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in index cddb969..c10eb39 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -17,8 +17,8 @@ <!-- XXX upgrades/derives RHL --> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 --> + <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL --> + <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 --> </devices> <!-- Disk 1 --> @@ -1299,10 +1299,10 @@ <eol-date>2009-07-10</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net --> + <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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1001"/> --> </devices> @@ -1665,7 +1665,7 @@ <eol-date>2009-12-18</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block --> </devices> <!-- DVD --> @@ -2017,7 +2017,7 @@ <eol-date>2010-06-25</eol-date> <devices> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet --> + <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet --> </devices> <!-- DVD --> diff --git a/data/oses/freebsd.xml.in b/data/oses/freebsd.xml.in index 59c84d8..6464060 100644 --- a/data/oses/freebsd.xml.in +++ b/data/oses/freebsd.xml.in @@ -360,7 +360,7 @@ <release-date>2005-11-04</release-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/> + <device id="http://pcisig.com/pci/10ec/8029"/> </devices> </os> @@ -478,7 +478,7 @@ <release-date>2009-11-25</release-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/> + <device id="http://pcisig.com/pci/8086/100e"/> </devices> </os> @@ -601,8 +601,8 @@ <eol-date>2015-01-31</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block --> </devices> </os> @@ -620,8 +620,8 @@ <eol-date>2016-12-31</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block --> </devices> <media arch="x86_64"> diff --git a/data/oses/gnome.xml.in b/data/oses/gnome.xml.in index b9acf3c..c18ab4d 100644 --- a/data/oses/gnome.xml.in +++ b/data/oses/gnome.xml.in @@ -74,11 +74,11 @@ <release-date>2013-09-25</release-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block --> - <device id="http://www.linux-usb.org/usb.ids/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://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 --> </devices> <resources arch="all"> diff --git a/data/oses/mandriva.xml.in b/data/oses/mandriva.xml.in index 2816367..3184516 100644 --- a/data/oses/mandriva.xml.in +++ b/data/oses/mandriva.xml.in @@ -95,8 +95,8 @@ <derives-from id="http://mandriva.com/mandriva/2009.1"/> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </devices> </os> @@ -158,8 +158,8 @@ <derives-from id="http://mandriva.com/mes/5.0"/> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </devices> </os> diff --git a/data/oses/openbsd.xml.in b/data/oses/openbsd.xml.in index 2d5085c..9f1ecda 100644 --- a/data/oses/openbsd.xml.in +++ b/data/oses/openbsd.xml.in @@ -154,7 +154,7 @@ <derives-from id='http://openbsd.org/openbsd/4.8'/> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/> + <device id="http://pcisig.com/pci/1022/2000"/> </devices> <media arch='i686'> @@ -331,8 +331,8 @@ </media> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block --> </devices> </os> diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in index 8bfbbcd..3aa53dd 100644 --- a/data/oses/rhel.xml.in +++ b/data/oses/rhel.xml.in @@ -584,8 +584,8 @@ <eol-date>2020-03-31</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </devices> <media arch="i686"> @@ -757,9 +757,9 @@ <eol-date>2023-11-30</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> + <device id="http://usb.org/usb/80ee/0021"/> </devices> <media arch="i686"> @@ -1111,11 +1111,11 @@ <upgrades id="http://redhat.com/rhel/6.5"/> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 --> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net --> + <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/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> </devices> <media arch="i686"> @@ -1190,11 +1190,11 @@ <derives-from id="http://redhat.com/rhel/7.0"/> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 --> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net --> + <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/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> </devices> <media arch="x86_64"> diff --git a/data/oses/solaris.xml.in b/data/oses/solaris.xml.in index 8c7c276..e7193df 100644 --- a/data/oses/solaris.xml.in +++ b/data/oses/solaris.xml.in @@ -19,7 +19,7 @@ <upgrades id="http://sun.com/solaris/9"/> <devices> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> + <device id="http://usb.org/usb/80ee/0021"/> </devices> </os> @@ -42,7 +42,7 @@ <distro>opensolaris</distro> <devices> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> + <device id="http://usb.org/usb/80ee/0021"/> </devices> </os> diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in index 1d913dc..fded429 100644 --- a/data/oses/suse.xml.in +++ b/data/oses/suse.xml.in @@ -29,8 +29,8 @@ <upgrades id="http://suse.com/sles/10"/> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </devices> </os> diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in index 4624d2c..6857e01 100644 --- a/data/oses/ubuntu.xml.in +++ b/data/oses/ubuntu.xml.in @@ -587,7 +587,7 @@ <eol-date>2013-05-09</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1000"/> </devices> <media arch="i686"> @@ -718,7 +718,7 @@ <eol-date>2010-10-23</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </devices> <media arch="i686"> diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 10fd072..03439ef 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -196,10 +196,10 @@ <eol-date>2001-12-13</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA --> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/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"/> <!-- USB tablet --> + <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 --> </devices> <resources arch="i686"> @@ -279,10 +279,10 @@ <eol-date>2010-07-13</eol-date> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA --> - <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet --> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/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"/> <!-- USB tablet --> + <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 --> </devices> <media arch="i686"> @@ -389,7 +389,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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </driver> <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/amd64"; pre-installable="true" signed="false"> @@ -398,7 +398,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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </driver> <!-- All virtio and QXL device drivers, and spice-vdagent --> @@ -407,11 +407,11 @@ <file>spice-guest-tools-0.65.cmd</file> <file>redhat09.cer</file> <file>redhat10.cer</file> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/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/1b36/0100"/> </driver> <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false"> @@ -419,11 +419,11 @@ <file>spice-guest-tools-0.65.cmd</file> <file>redhat09.cer</file> <file>redhat10.cer</file> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/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/1b36/0100"/> </driver> </os> @@ -904,7 +904,7 @@ </resources> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 --> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 --> </devices> <installer> @@ -918,14 +918,14 @@ <file>viostor.cat</file> <file>viostor.inf</file> <file>viostor.sys</file> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + <device id="http://pcisig.com/pci/1af4/1001"/> </driver> <!-- All virtio and QXL device drivers, and spice-vdagent --> @@ -934,11 +934,11 @@ <file>spice-guest-tools-0.65.cmd</file> <file>redhat09.cer</file> <file>redhat10.cer</file> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/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/1b36/0100"/> </driver> <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false"> @@ -946,11 +946,11 @@ <file>spice-guest-tools-0.65.cmd</file> <file>redhat09.cer</file> <file>redhat10.cer</file> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/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/1b36/0100"/> </driver> </os> @@ -1003,7 +1003,7 @@ </resources> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 --> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 --> </devices> <installer> @@ -1156,7 +1156,7 @@ </resources> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 --> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 --> </devices> </os> @@ -1351,7 +1351,7 @@ </resources> <devices> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 --> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 --> </devices> </os> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index 3fb0bb6..bcea3fc 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -1665,8 +1665,8 @@ osinfo_loader_process_file_reg_ids(OsinfoLoader *loader, WANT_REST(device); SAVE_BUF(device_buf); - gchar *id = g_strdup_printf("%s/%s/%s", - baseURI, vendor_id, device_id); + gchar *id = g_strdup_printf("%s/%s/%s/%s", + baseURI, busType, vendor_id, device_id); OsinfoDevice *dev = osinfo_loader_get_device(loader, id); g_hash_table_remove(loader->priv->entity_refs, id); @@ -1717,7 +1717,7 @@ osinfo_loader_process_file_reg_usb(OsinfoLoader *loader, file, info, FALSE, - "http://www.linux-usb.org/usb.ids";, + "http://usb.org";, "usb", err); } @@ -1732,7 +1732,7 @@ osinfo_loader_process_file_reg_pci(OsinfoLoader *loader, file, info, TRUE, - "http://pciids.sourceforge.net/v2.2/pci.ids";, + "http://pcisig.com";, "pci", err); } -- 2.4.3 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
