[virt-tools-list] [libosinfo] Correct a typo in all XML files

[Zeeshan Ali]

From: Zeeshan Ali (Khattak) zeesha...@gnome.org

---
 data/oses/debian.xml|6 +++---
 data/oses/fedora.xml|8 
 data/oses/generic-linux.xml |4 ++--
 data/oses/mandriva.xml  |8 
 data/oses/rhel.xml  |   10 +-
 data/oses/suse.xml  |4 ++--
 data/oses/ubuntu.xml|4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/data/oses/debian.xml b/data/oses/debian.xml
index a14ac14..17981e7 100644
--- a/data/oses/debian.xml
+++ b/data/oses/debian.xml
@@ -15,8 +15,8 @@
 upgrades id=http://debian.org/etch/
 
 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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000/
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001/
 /devices
   /os
 
@@ -28,7 +28,7 @@
 upgrades id=http://debian.org/lenny/
 
 devices
-  device id=http://www.linux-usb.org/usb.ids/80ee/0021;
+  device id=http://www.linux-usb.org/usb.ids/80ee/0021/
 /devices
   /os
 
diff --git a/data/oses/fedora.xml b/data/oses/fedora.xml
index 57281de..73f1dc1 100644
--- a/data/oses/fedora.xml
+++ b/data/oses/fedora.xml
@@ -39,10 +39,10 @@
 upgrades id=http://fedoraproject.org/fedora/8/
 
 devices
-  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000;
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000/
   !-- 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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001/
   --
 /devices
   /os
@@ -55,7 +55,7 @@
 upgrades id=http://fedoraproject.org/fedora/9/
 
 devices
-  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001;
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001/
 /devices
   /os
 
@@ -67,7 +67,7 @@
 upgrades id=http://fedoraproject.org/fedora/10/
 
 devices
-  device id=http://www.linux-usb.org/usb.ids/80ee/0021;
+  device id=http://www.linux-usb.org/usb.ids/80ee/0021/
 /devices
   /os
 
diff --git a/data/oses/generic-linux.xml b/data/oses/generic-linux.xml
index dec6e0c..3b9d568 100644
--- a/data/oses/generic-linux.xml
+++ b/data/oses/generic-linux.xml
@@ -21,8 +21,8 @@
 vendorLinux Kernel Developers/vendor
 
 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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000/
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001/
 /devices
   /os
 
diff --git a/data/oses/mandriva.xml b/data/oses/mandriva.xml
index 5984cf0..4118128 100644
--- a/data/oses/mandriva.xml
+++ b/data/oses/mandriva.xml
@@ -14,8 +14,8 @@
 vendorMandriva/vendor
 
 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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000/
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001/
 /devices
   /os
 
@@ -33,8 +33,8 @@
 vendorMandriva/vendor
 
 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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000/
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001/
 /devices
   /os
 
diff --git a/data/oses/rhel.xml b/data/oses/rhel.xml
index 1d96a37..a8458f1 100644
--- a/data/oses/rhel.xml
+++ b/data/oses/rhel.xml
@@ -43,8 +43,8 @@
 vendorRed Hat, Inc/vendor
 
 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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000/
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001/
 /devices
   /os
 
@@ -63,9 +63,9 @@
 vendorRed Hat, Inc/vendor
 
 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://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/
 /devices
   /os
 
diff --git a/data/oses/suse.xml b/data/oses/suse.xml
index 496a25e..0f9bcb0 100644
--- a/data/oses/suse.xml
+++ b/data/oses/suse.xml
@@ -14,8 +14,8 @@
 vendorNovell/vendor
 
 devices
-  device 

[virt-tools-list] [libosinfo] Add Windows OS metadata

[Zeeshan Ali]

From: Zeeshan Ali (Khattak) zeesha...@gnome.org

---
 data/oses/Makefile.am |3 +-
 data/oses/windows.xml |   72 +
 2 files changed, 74 insertions(+), 1 deletions(-)
 create mode 100644 data/oses/windows.xml

diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 87be72b..7afd1d6 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -8,6 +8,7 @@ database_DATA = \
   mandriva.xml  \
   debian.xml\
   ubuntu.xml\
-  generic-linux.xml
+  generic-linux.xml \
+  windows.xml
 
 EXTRA_DIST = $(database_DATA)
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
new file mode 100644
index 000..70cb9f5
--- /dev/null
+++ b/data/oses/windows.xml
@@ -0,0 +1,72 @@
+libosinfo version=0.0.1
+
+  os id=http://microsoft.com/windows;
+short-idwindow/short-id
+nameMicrosoft Windows/name
+!-- Version is dummy here because this is just a generic entry --
+version1/version
+vendorMicrosoft/vendor
+
+devices
+  device id=http://pciids.sourceforge.net/v2.2/pci.ids/1234//
+  device id=http://www.linux-usb.org/usb.ids/80ee/0021/
+/devices
+  /os
+
+  os id=http://microsoft.com/winxp;
+short-idwinxp/short-id
+nameMicrosoft Windows XP/name
+version5.1/version
+vendorMicrosoft/vendor
+upgrades id=http://microsoft.com/windows/
+  /os
+
+  os id=http://microsoft.com/winxp64;
+short-idwinxp64/short-id
+nameMicrosoft Windows XP (x86_64)/name
+version5.2/version
+vendorMicrosoft/vendor
+upgrades id=http://microsoft.com/windows/
+  /os
+
+  os id=http://microsoft.com/win2k;
+short-idwin2k/short-id
+nameMicrosoft Windows 2000/name
+version5.0/version
+vendorMicrosoft/vendor
+upgrades id=http://microsoft.com/windows/
+  /os
+
+  os id=http://microsoft.com/win2k3;
+short-idwin2k3/short-id
+nameMicrosoft Windows Server 2003/name
+version5.2/version
+vendorMicrosoft/vendor
+upgrades id=http://microsoft.com/windows/
+  /os
+
+  os id=http://microsoft.com/win2k8;
+short-idwin2k8/short-id
+nameMicrosoft Windows Server 2008/name
+version6.0/version
+vendorMicrosoft/vendor
+upgrades id=http://microsoft.com/windows/
+  /os
+
+  os id=http://microsoft.com/vista;
+short-idvista/short-id
+nameMicrosoft Windows Vista/name
+version6.0/version
+vendorMicrosoft/vendor
+upgrades id=http://microsoft.com/windows/
+  /os
+
+  os id=http://microsoft.com/win7;
+short-idwin7/short-id
+nameMicrosoft Windows 7/name
+version6.1/version
+vendorMicrosoft/vendor
+upgrades id=http://microsoft.com/windows/
+  /os
+
+/libosinfo
-- 
1.7.5.2

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

Re: [virt-tools-list] [libosinfo] Add Windows OS metadata

[Richard W.M. Jones]

On Thu, Jun 16, 2011 at 07:49:12PM +0300, Zeeshan Ali wrote:
 From: Zeeshan Ali (Khattak) zeesha...@gnome.org
 +  os id=http://microsoft.com/win2k8;
 +short-idwin2k8/short-id
 +nameMicrosoft Windows Server 2008/name
 +version6.0/version
 +vendorMicrosoft/vendor
 +upgrades id=http://microsoft.com/windows/
 +  /os
 +
 +  os id=http://microsoft.com/vista;
 +short-idvista/short-id
 +nameMicrosoft Windows Vista/name
 +version6.0/version
 +vendorMicrosoft/vendor
 +upgrades id=http://microsoft.com/windows/
 +  /os

You need to expose the product variant field somewhere, else there is
no way to distinguish between these two operating systems.  IIRC for
W2K8 this field contains Server and for Vista it contains Client.
If you have an existing Windows guest, run virt-inspector on it to
display the product variant from the registry.

Product variants are also useful elsewhere.  In virt-inspector, we use
this field to distinguish different spins of RHEL (like Red Hat
Desktop vs. the regular Server spin).

http://libguestfs.org/virt-inspector.1.html#_operatingsystem_
http://libguestfs.org/guestfs.3.html#guestfs_inspect_get_product_variant

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list