[PATCH v3 37/60] data: split windows into one file per OS

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

 



Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
 data/oses/Makefile.am                     |   11 -
 data/oses/microsoft.com/win-1.0.xml.in    |   13 +
 data/oses/microsoft.com/win-10.xml.in     |   63 ++
 data/oses/microsoft.com/win-2.0.xml.in    |   15 +
 data/oses/microsoft.com/win-2.1.xml.in    |   15 +
 data/oses/microsoft.com/win-2k.xml.in     |   49 ++
 data/oses/microsoft.com/win-2k12.xml.in   |   68 ++
 data/oses/microsoft.com/win-2k12r2.xml.in |   67 ++
 data/oses/microsoft.com/win-2k3.xml.in    |   72 ++
 data/oses/microsoft.com/win-2k3r2.xml.in  |   65 ++
 data/oses/microsoft.com/win-2k8.xml.in    |   65 ++
 data/oses/microsoft.com/win-2k8r2.xml.in  |   50 ++
 data/oses/microsoft.com/win-3.1.xml.in    |   15 +
 data/oses/microsoft.com/win-7.xml.in      |  231 +++++
 data/oses/microsoft.com/win-8.1.xml.in    |  149 ++++
 data/oses/microsoft.com/win-8.xml.in      |   59 ++
 data/oses/microsoft.com/win-95.xml.in     |   30 +
 data/oses/microsoft.com/win-98.xml.in     |   28 +
 data/oses/microsoft.com/win-me.xml.in     |   28 +
 data/oses/microsoft.com/win-vista.xml.in  |   50 ++
 data/oses/microsoft.com/win-xp.xml.in     |  113 +++
 data/oses/microsoft.com/winnt-3.1.xml.in  |   12 +
 data/oses/microsoft.com/winnt-3.5.xml.in  |   15 +
 data/oses/microsoft.com/winnt-3.51.xml.in |   15 +
 data/oses/microsoft.com/winnt-4.0.xml.in  |   15 +
 data/oses/windows.xml.in                  | 1358 -----------------------------
 po/POTFILES.in                            |   25 +-
 27 files changed, 1326 insertions(+), 1370 deletions(-)
 create mode 100644 data/oses/microsoft.com/win-1.0.xml.in
 create mode 100644 data/oses/microsoft.com/win-10.xml.in
 create mode 100644 data/oses/microsoft.com/win-2.0.xml.in
 create mode 100644 data/oses/microsoft.com/win-2.1.xml.in
 create mode 100644 data/oses/microsoft.com/win-2k.xml.in
 create mode 100644 data/oses/microsoft.com/win-2k12.xml.in
 create mode 100644 data/oses/microsoft.com/win-2k12r2.xml.in
 create mode 100644 data/oses/microsoft.com/win-2k3.xml.in
 create mode 100644 data/oses/microsoft.com/win-2k3r2.xml.in
 create mode 100644 data/oses/microsoft.com/win-2k8.xml.in
 create mode 100644 data/oses/microsoft.com/win-2k8r2.xml.in
 create mode 100644 data/oses/microsoft.com/win-3.1.xml.in
 create mode 100644 data/oses/microsoft.com/win-7.xml.in
 create mode 100644 data/oses/microsoft.com/win-8.1.xml.in
 create mode 100644 data/oses/microsoft.com/win-8.xml.in
 create mode 100644 data/oses/microsoft.com/win-95.xml.in
 create mode 100644 data/oses/microsoft.com/win-98.xml.in
 create mode 100644 data/oses/microsoft.com/win-me.xml.in
 create mode 100644 data/oses/microsoft.com/win-vista.xml.in
 create mode 100644 data/oses/microsoft.com/win-xp.xml.in
 create mode 100644 data/oses/microsoft.com/winnt-3.1.xml.in
 create mode 100644 data/oses/microsoft.com/winnt-3.5.xml.in
 create mode 100644 data/oses/microsoft.com/winnt-3.51.xml.in
 create mode 100644 data/oses/microsoft.com/winnt-4.0.xml.in
 delete mode 100644 data/oses/windows.xml.in

diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index c461885..9ebcdf3 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -20,14 +20,3 @@ SUBDIRS = \
 	suse.com \
 	ubuntu.com \
 	$(NULL)
-
-databasedir = $(pkgdatadir)/db/oses/
-database_in_files =	\
-	windows.xml.in  \
-	$(NULL)
-
-database_DATA = $(database_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/oses/microsoft.com/win-1.0.xml.in b/data/oses/microsoft.com/win-1.0.xml.in
new file mode 100644
index 0000000..7ce76de
--- /dev/null
+++ b/data/oses/microsoft.com/win-1.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/1.0";>
+    <short-id>win1.0</short-id>
+    <_name>Microsoft Windows 1.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>1.0</version>
+
+    <release-date>1985-11-20</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-10.xml.in b/data/oses/microsoft.com/win-10.xml.in
new file mode 100644
index 0000000..67ef6fe
--- /dev/null
+++ b/data/oses/microsoft.com/win-10.xml.in
@@ -0,0 +1,63 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/10";>
+    <short-id>win10</short-id>
+    <_name>Microsoft Windows 10</_name>
+    <version>10.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/8.1"/>
+    <upgrades id="http://microsoft.com/win/8.1"/>
+
+    <release-date>2015-07-29</release-date>
+
+    <variant id="education">
+      <_name>Microsoft Windows 10 Education</_name>
+    </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 10 Enterprise</_name>
+    </variant>
+
+    <!-- Education -->
+    <media arch="i686">
+      <variant id="education"/>
+      <iso>
+        <volume-id>J_CEDA_X86FRE_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise -->
+    <media arch="i686">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>J_CENA_X86FREV_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2.0.xml.in b/data/oses/microsoft.com/win-2.0.xml.in
new file mode 100644
index 0000000..6f6a3ae
--- /dev/null
+++ b/data/oses/microsoft.com/win-2.0.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2.0";>
+    <short-id>win2.0</short-id>
+    <_name>Microsoft Windows 2.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>2.0</version>
+    <upgrades id="http://microsoft.com/win/1.0"/>
+    <derives-from id="http://microsoft.com/win/1.0"/>
+
+    <release-date>1987-12-09</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2.1.xml.in b/data/oses/microsoft.com/win-2.1.xml.in
new file mode 100644
index 0000000..6c43799
--- /dev/null
+++ b/data/oses/microsoft.com/win-2.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2.1";>
+    <short-id>win2.1</short-id>
+    <_name>Microsoft Windows 2.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>2.1</version>
+    <upgrades id="http://microsoft.com/win/2.0"/>
+    <derives-from id="http://microsoft.com/win/2.0"/>
+
+    <release-date>1988-05-27</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2k.xml.in b/data/oses/microsoft.com/win-2k.xml.in
new file mode 100644
index 0000000..dc0076c
--- /dev/null
+++ b/data/oses/microsoft.com/win-2k.xml.in
@@ -0,0 +1,49 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k";>
+    <short-id>win2k</short-id>
+    <_name>Microsoft Windows 2000</_name>
+    <version>5.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/me"/>
+
+    <release-date>2000-02-17</release-date>
+    <eol-date>2010-07-13</eol-date>
+
+    <devices>
+      <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">
+      <iso>
+          <volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
+          <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>33554432</ram>
+        <storage>335544320</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>350000000</cpu>
+        <ram>100663296</ram>
+        <storage>1073741824</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2k12.xml.in b/data/oses/microsoft.com/win-2k12.xml.in
new file mode 100644
index 0000000..5a82b7f
--- /dev/null
+++ b/data/oses/microsoft.com/win-2k12.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k12";>
+    <short-id>win2k12</short-id>
+    <_name>Microsoft Windows Server 2012</_name>
+    <version>6.3</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k8r2"/>
+    <upgrades id="http://microsoft.com/win/2k8r2"/>
+
+    <release-date>2012-09-04</release-date>
+
+    <variant id="storage">
+      <_name>Windows Server 2012 Storage</_name>
+    </variant>
+    <variant id="hyperv">
+      <_name>Windows Server 2012 for HyperV</_name>
+    </variant>
+    <variant id="essentials">
+      <_name>Windows Server 2012 Essentials</_name>
+    </variant>
+    <variant id="volume-license">
+      <_name>Windows Server 2012 Volume License</_name>
+    </variant>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <media arch="x86_64">
+      <variant id="essentials"/>
+      <iso>
+        <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="hyperv"/>
+      <iso>
+        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="storage"/>
+      <iso>
+        <volume-id>(HRM_SFST_X64FREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="volume-licence"/>
+      <iso>
+        <volume-id>(HRM_SSS_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2k12r2.xml.in b/data/oses/microsoft.com/win-2k12r2.xml.in
new file mode 100644
index 0000000..7a1e6cf
--- /dev/null
+++ b/data/oses/microsoft.com/win-2k12r2.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k12r2";>
+    <short-id>win2k12r2</short-id>
+    <_name>Microsoft Windows Server 2012 R2</_name>
+    <version>6.3</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k12"/>
+    <upgrades id="http://microsoft.com/win/2k12"/>
+
+    <variant id="storage">
+      <_name>Windows Server 2012 R2 Storage</_name>
+    </variant>
+    <variant id="hyperv">
+      <_name>Windows Server 2012 R2 for HyperV</_name>
+    </variant>
+    <variant id="essentials">
+      <_name>Windows Server 2012 R2 Essentials</_name>
+    </variant>
+    <variant id="volume-license">
+      <_name>Windows Server 2012 R2 Volume License</_name>
+    </variant>
+
+    <release-date>2013-10-18</release-date>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="essentials"/>
+      <iso>
+        <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="hyperv"/>
+      <iso>
+        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="volume-licence"/>
+      <iso>
+        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="storage"/>
+      <iso>
+        <volume-id>(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2k3.xml.in b/data/oses/microsoft.com/win-2k3.xml.in
new file mode 100644
index 0000000..e22c95a
--- /dev/null
+++ b/data/oses/microsoft.com/win-2k3.xml.in
@@ -0,0 +1,72 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k3";>
+    <short-id>win2k3</short-id>
+    <_name>Microsoft Windows Server 2003</_name>
+    <version>5.2</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k"/>
+    <upgrades id="http://microsoft.com/win/2k"/>
+
+    <release-date>2003-04-24</release-date>
+    <eol-date>2015-07-14</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="ia64">
+      <iso>
+        <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>2147483648</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>550000000</cpu>
+        <ram>268435456</ram>
+        <storage>4294967296</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>4294967296</storage>
+      </minimum>
+
+      <recommended>
+        <storage>8589934592</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2k3r2.xml.in b/data/oses/microsoft.com/win-2k3r2.xml.in
new file mode 100644
index 0000000..f9b6186
--- /dev/null
+++ b/data/oses/microsoft.com/win-2k3r2.xml.in
@@ -0,0 +1,65 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k3r2";>
+    <short-id>win2k3r2</short-id>
+    <_name>Microsoft Windows Server 2003 R2</_name>
+    <version>5.2</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k3"/>
+    <upgrades id="http://microsoft.com/win/2k3"/>
+
+    <release-date>2005-12-06</release-date>
+    <eol-date>2015-07-14</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>2147483648</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>550000000</cpu>
+        <ram>268435456</ram>
+        <storage>4294967296</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>4294967296</storage>
+      </minimum>
+
+      <recommended>
+        <storage>8589934592</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2k8.xml.in b/data/oses/microsoft.com/win-2k8.xml.in
new file mode 100644
index 0000000..116e242
--- /dev/null
+++ b/data/oses/microsoft.com/win-2k8.xml.in
@@ -0,0 +1,65 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k8";>
+    <short-id>win2k8</short-id>
+    <_name>Microsoft Windows Server 2008</_name>
+    <version>6.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k3r2"/>
+    <upgrades id="http://microsoft.com/win/2k3r2"/>
+
+    <release-date>2008-02-27</release-date>
+    <eol-date>2013-07-09</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1400000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-2k8r2.xml.in b/data/oses/microsoft.com/win-2k8r2.xml.in
new file mode 100644
index 0000000..9a59e9b
--- /dev/null
+++ b/data/oses/microsoft.com/win-2k8r2.xml.in
@@ -0,0 +1,50 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k8r2";>
+    <short-id>win2k8r2</short-id>
+    <_name>Microsoft Windows Server 2008 R2</_name>
+    <version>6.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k8"/>
+    <upgrades id="http://microsoft.com/win/2k8"/>
+
+    <release-date>2009-10-22</release-date>
+    <eol-date>2013-07-09</eol-date>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="ia64">
+      <iso>
+        <volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1400000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-3.1.xml.in b/data/oses/microsoft.com/win-3.1.xml.in
new file mode 100644
index 0000000..f13d31b
--- /dev/null
+++ b/data/oses/microsoft.com/win-3.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/3.1";>
+    <short-id>win3.1</short-id>
+    <_name>Microsoft Windows 3.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>3.1</version>
+    <upgrades id="http://microsoft.com/win/2.1"/>
+    <derives-from id="http://microsoft.com/win/2.1"/>
+
+    <release-date>1992-04-06</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-7.xml.in b/data/oses/microsoft.com/win-7.xml.in
new file mode 100644
index 0000000..c9e3ca8
--- /dev/null
+++ b/data/oses/microsoft.com/win-7.xml.in
@@ -0,0 +1,231 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/7";>
+    <short-id>win7</short-id>
+    <_name>Microsoft Windows 7</_name>
+    <version>6.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/vista"/>
+    <upgrades id="http://microsoft.com/win/vista"/>
+
+    <release-date>2009-10-22</release-date>
+    <eol-date>2015-01-13</eol-date>
+
+    <variant id="debug">
+      <_name>Microsoft Windows 7 Debug Checked Build</_name>
+    </variant>
+    <variant id="starter">
+      <_name>Microsoft Windows 7 Starter</_name>
+    </variant>
+    <variant id="home-basic">
+      <_name>Microsoft Windows 7 Home Basic</_name>
+    </variant>
+    <variant id="home-premium">
+      <_name>Microsoft Windows 7 Home Premium</_name>
+    </variant>
+    <variant id="professional">
+      <_name>Microsoft Windows 7 Professional</_name>
+    </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 7 Enterprise</_name>
+    </variant>
+    <variant id="ultimate">
+      <_name>Microsoft Windows 7 Ultimate</_name>
+    </variant>
+
+    <!-- Debug -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(GRMCCHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(GRMCXCHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Starter -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="starter"/>
+      <iso>
+        <volume-id>(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Home Basic -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="home-basic"/>
+      <iso>
+        <volume-id>(GSP1RMCHBFRER|GRMCHBFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Home Premium -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="home-premium"/>
+      <iso>
+        <volume-id>(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="home-premium"/>
+      <iso>
+        <volume-id>(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Professional -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GSP1RMCNENXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Ultimate -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="ultimate"/>
+      <iso>
+        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="ultimate"/>
+      <iso>
+        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GSP1RMCULXFRER|GRMCNULXFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Variant unknown -->
+    <media arch="i686" installer-reboots="2">
+      <iso>
+        <volume-id>(GRMCPRFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <iso>
+        <volume-id>(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+    </devices>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+
+    <!-- virtio block device driver -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/x86"; pre-installable="true" signed="false">
+      <file>viostor.cat</file>
+      <file>viostor.inf</file>
+      <file>viostor.sys</file>
+      <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://pcisig.com/pci/1af4/1001"/>
+    </driver>
+
+    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <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">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <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>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-8.1.xml.in b/data/oses/microsoft.com/win-8.1.xml.in
new file mode 100644
index 0000000..f746d10
--- /dev/null
+++ b/data/oses/microsoft.com/win-8.1.xml.in
@@ -0,0 +1,149 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/8.1";>
+    <short-id>win8.1</short-id>
+    <_name>Microsoft Windows 8.1</_name>
+    <version>6.3</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/8"/>
+    <upgrades id="http://microsoft.com/win/8"/>
+
+<!--
+    <release-date></release-date>
+    <eol-date></eol-date>
+-->
+
+    <variant id="debug">
+      <_name>Microsoft Windows 8.1 Debug Checked Build</_name>
+    </variant>
+    <variant id="enterprise-debug">
+      <_name>Microsoft Windows 8.1 Enterprise Debug Checked Build</_name>
+    </variant>
+    <variant id="professional">
+      <_name>Microsoft Windows 8.1 Professional</_name>
+    </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 8.1 Enterprise</_name>
+    </variant>
+
+    <!-- Debug -->
+    <media arch="i686">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(IRM_CCSN?A_X86CHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(IRM_CCSN?A_X64CHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise Debug -->
+    <media arch="i686">
+      <variant id="enterprise-debug"/>
+      <iso>
+        <volume-id>(IRM_CENN?A_X86CHKV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="enterprise-debug"/>
+      <iso>
+        <volume-id>(IRM_CENN?A_X64CHKV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Professional -->
+    <media arch="i686">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(IR1_CPRN?A_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(IR1_CPRN?A_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise -->
+    <media arch="i686">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(IR1_CENNA_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(IR[135]_CENN?A_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- No variant -->
+    <media arch="i686">
+      <iso>
+        <volume-id>(IR5_CCSNA_X86FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Variant unknown -->
+    <media arch="i686">
+      <iso>
+        <volume-id>(IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE|IR3_CENA_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-8.xml.in b/data/oses/microsoft.com/win-8.xml.in
new file mode 100644
index 0000000..d20b239
--- /dev/null
+++ b/data/oses/microsoft.com/win-8.xml.in
@@ -0,0 +1,59 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/8";>
+    <short-id>win8</short-id>
+    <_name>Microsoft Windows 8</_name>
+    <version>6.2</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/7"/>
+    <upgrades id="http://microsoft.com/win/7"/>
+
+<!--
+    <release-date></release-date>
+    <eol-date></eol-date>
+-->
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(HB1_CCPA_X86FRE|HRM_CCSA_X86FRE|HRM_CCSA_X86CHK|HRM_CCSNA_X86CHK|HRM_CCSNA_X86FRE|HRM_CENA_X86FREV|HRM_CENA_X86CHKV|HRM_CENNA_X86FREV|HRM_CENNA_X86CHKV|HRM_CPRA_X86FREV|HRM_CPRNA_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(HB1_CCPA_X64FRE|HRM_CCSA_X64FRE|HRM_CCSA_X64CHK|HRM_CCSNA_X64FRE|HRM_CCSNA_X64CHK|HRM_CENNA_X64FREV|HRM_CENNA_X64CHKV|HRM_CENA_X64FREV|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
+    </devices>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-95.xml.in b/data/oses/microsoft.com/win-95.xml.in
new file mode 100644
index 0000000..9246294
--- /dev/null
+++ b/data/oses/microsoft.com/win-95.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/95";>
+    <short-id>win95</short-id>
+    <_name>Microsoft Windows 95</_name>
+    <version>4.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <upgrades id="http://microsoft.com/win/3.1"/>
+    <derives-from id="http://microsoft.com/win/3.1"/>
+
+    <release-date>1995-08-24</release-date>
+    <eol-date>2001-12-13</eol-date>
+
+    <devices>
+      <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">
+      <minimum>
+        <cpu>12000000</cpu>
+        <ram>4194304</ram>
+        <storage>41943040</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-98.xml.in b/data/oses/microsoft.com/win-98.xml.in
new file mode 100644
index 0000000..97f092d
--- /dev/null
+++ b/data/oses/microsoft.com/win-98.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/98";>
+    <short-id>win98</short-id>
+    <_name>Microsoft Windows 98</_name>
+    <version>4.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/95"/>
+    <upgrades id="http://microsoft.com/win/95"/>
+
+    <release-date>1998-06-25</release-date>
+    <eol-date>2006-07-11</eol-date>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>66000000</cpu>
+        <ram>16777216</ram>
+        <storage>125829120</storage>
+      </minimum>
+      <recommended>
+        <cpu>233000000</cpu>
+        <ram>25165824</ram>
+        <storage>419430400</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-me.xml.in b/data/oses/microsoft.com/win-me.xml.in
new file mode 100644
index 0000000..a43e320
--- /dev/null
+++ b/data/oses/microsoft.com/win-me.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/me";>
+    <short-id>winme</short-id>
+    <_name>Microsoft Windows Millennium Edition</_name>
+    <version>4.9</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/98"/>
+    <upgrades id="http://microsoft.com/win/98"/>
+
+    <release-date>2000-09-14</release-date>
+    <eol-date>2006-07-11</eol-date>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>150000000</cpu>
+        <ram>33554432</ram>
+        <storage>335544320</storage>
+      </minimum>
+      <recommended>
+        <cpu>300000000</cpu>
+        <ram>67108864</ram>
+        <storage>2147483648</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-vista.xml.in b/data/oses/microsoft.com/win-vista.xml.in
new file mode 100644
index 0000000..f1589b9
--- /dev/null
+++ b/data/oses/microsoft.com/win-vista.xml.in
@@ -0,0 +1,50 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/vista";>
+    <short-id>winvista</short-id>
+    <_name>Microsoft Windows Vista</_name>
+    <version>6.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/xp"/>
+    <upgrades id="http://microsoft.com/win/xp"/>
+
+    <release-date>2006-11-30</release-date>
+    <eol-date>2012-04-10</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMEXVOL|FRTMEXVOL|FRMBXVOL|FRMCXFRE)_</volume-id>
+       <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+
+    <resources arch="all">
+      <minimum>
+        <cpu>800000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>16106127360</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/win-xp.xml.in b/data/oses/microsoft.com/win-xp.xml.in
new file mode 100644
index 0000000..3e181d9
--- /dev/null
+++ b/data/oses/microsoft.com/win-xp.xml.in
@@ -0,0 +1,113 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/xp";>
+    <short-id>winxp</short-id>
+    <_name>Microsoft Windows XP</_name>
+    <version>5.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k"/>
+    <derives-from id="http://microsoft.com/win/me"/>
+    <upgrades id="http://microsoft.com/win/me"/>
+
+    <release-date>2001-10-25</release-date>
+    <eol-date>2009-04-19</eol-date>
+
+    <media arch="i686" installer-reboots="2">
+      <iso>
+        <volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <media arch="x86_64" installer-reboots="2">
+      <iso>
+        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>233000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>1610612736</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>300000000</cpu>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>733000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>268435456</ram>
+        <storage>1610612736</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>733000000</cpu>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+
+    <!-- virtio block device driver -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/x86"; pre-installable="true" signed="false">
+      <file>viostor.cat</file>
+      <file>viostor.inf</file>
+      <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://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">
+      <file>viostor.cat</file>
+      <file>viostor.inf</file>
+      <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://pcisig.com/pci/1af4/1001"/>
+    </driver>
+
+    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <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">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <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>
+</libosinfo>
diff --git a/data/oses/microsoft.com/winnt-3.1.xml.in b/data/oses/microsoft.com/winnt-3.1.xml.in
new file mode 100644
index 0000000..a873e18
--- /dev/null
+++ b/data/oses/microsoft.com/winnt-3.1.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/3.1";>
+    <short-id>winnt3.1</short-id>
+    <_name>Microsoft Windows NT Server 3.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.1</version>
+    <release-date>1993-07-27</release-date>
+    <eol-date>2000-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/winnt-3.5.xml.in b/data/oses/microsoft.com/winnt-3.5.xml.in
new file mode 100644
index 0000000..202466a
--- /dev/null
+++ b/data/oses/microsoft.com/winnt-3.5.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/3.5";>
+    <short-id>winnt3.5</short-id>
+    <_name>Microsoft Windows NT Server 3.5</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.5</version>
+    <upgrades id="http://microsoft.com/winnt/3.1"/>
+    <derives-from id="http://microsoft.com/winnt/3.1"/>
+
+    <release-date>1994-09-21</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/winnt-3.51.xml.in b/data/oses/microsoft.com/winnt-3.51.xml.in
new file mode 100644
index 0000000..18397c9
--- /dev/null
+++ b/data/oses/microsoft.com/winnt-3.51.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/3.51";>
+    <short-id>winnt3.51</short-id>
+    <_name>Microsoft Windows NT Server 3.51</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.51</version>
+    <upgrades id="http://microsoft.com/winnt/3.5"/>
+    <derives-from id="http://microsoft.com/winnt/3.5"/>
+
+    <release-date>1995-05-30</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/microsoft.com/winnt-4.0.xml.in b/data/oses/microsoft.com/winnt-4.0.xml.in
new file mode 100644
index 0000000..34836bf
--- /dev/null
+++ b/data/oses/microsoft.com/winnt-4.0.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/4.0";>
+    <short-id>winnt4.0</short-id>
+    <_name>Microsoft Windows NT Server 4.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>4.0</version>
+    <upgrades id="http://microsoft.com/winnt/3.51"/>
+    <derives-from id="http://microsoft.com/winnt/3.51"/>
+
+    <release-date>1996-08-24</release-date>
+    <eol-date>2004-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
deleted file mode 100644
index 03439ef..0000000
--- a/data/oses/windows.xml.in
+++ /dev/null
@@ -1,1358 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <!--
-
-      The upgrade/derives relationship for Windows is more complex than
-      you might think, because of the merge/fork between WinME/XP/2k/2k3:
-
-
-   Win1.0 (Nov 1985)
-     |
-     | U, D
-     |
-     V
-   Win2.0 (Dec 1987)
-     |
-     | U, D
-     |
-     V
-   Win2.1 (May 1988)
-     |
-     | U, D
-     |
-     V
-   Win3.0 (May 1990)
-     |
-     | U, D
-     |
-     V
-   Win3.1 (Apr 1992)            WinNT3.1  (July 1993)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     |                            V
-     |                          WinNT3.4  (Sept 1994)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            V
-   Win95 (Aug 1995)             WinNT3.51 (May 1995)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            V
-   Win98 (Jun 1998)             WinNT4.0 (Aug 1996)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            |
-   WinME (Sep 2000)             Win2k  (Feb 2000)
-     |                           ||
-     \======+====================/| U, D
-       U    |  D                  |
-            V                     V
-          WinXP (Aug 2001)      Win2k3  (April 2003)
-            |                     |
-            | UD                  | U, D
-            |                     |
-            V                     V
-          WinVista (Jan 2007)   Win2k3r2 (Dec 2005)
-            |                     |
-            | U, D                | U, D
-            |                     |
-            |                     V
-            |                   Win2k8  (Feb 2008)
-            |                     |
-            |                     | U, D
-            |                     |
-            |                     V
-          Win7 (Oct 2009)       Win2k8r2 (Oct 2009)
-            |                     |
-            | U,D                 | U, D
-            |                     |
-            V                     V
-          Win8 (??? 2012)       ??????
-
-  -->
-
-  <os id="http://microsoft.com/win/1.0";>
-    <short-id>win1.0</short-id>
-    <_name>Microsoft Windows 1.0</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>1.0</version>
-
-    <release-date>1985-11-20</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/2.0";>
-    <short-id>win2.0</short-id>
-    <_name>Microsoft Windows 2.0</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>2.0</version>
-    <upgrades id="http://microsoft.com/win/1.0"/>
-    <derives-from id="http://microsoft.com/win/1.0"/>
-
-    <release-date>1987-12-09</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/2.1";>
-    <short-id>win2.1</short-id>
-    <_name>Microsoft Windows 2.1</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>2.1</version>
-    <upgrades id="http://microsoft.com/win/2.0"/>
-    <derives-from id="http://microsoft.com/win/2.0"/>
-
-    <release-date>1988-05-27</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/3.1";>
-    <short-id>win3.1</short-id>
-    <_name>Microsoft Windows 3.1</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>3.1</version>
-    <upgrades id="http://microsoft.com/win/2.1"/>
-    <derives-from id="http://microsoft.com/win/2.1"/>
-
-    <release-date>1992-04-06</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.1";>
-    <short-id>winnt3.1</short-id>
-    <_name>Microsoft Windows NT Server 3.1</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.1</version>
-    <release-date>1993-07-27</release-date>
-    <eol-date>2000-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.5";>
-    <short-id>winnt3.5</short-id>
-    <_name>Microsoft Windows NT Server 3.5</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.5</version>
-    <upgrades id="http://microsoft.com/winnt/3.1"/>
-    <derives-from id="http://microsoft.com/winnt/3.1"/>
-
-    <release-date>1994-09-21</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.51";>
-    <short-id>winnt3.51</short-id>
-    <_name>Microsoft Windows NT Server 3.51</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.51</version>
-    <upgrades id="http://microsoft.com/winnt/3.5"/>
-    <derives-from id="http://microsoft.com/winnt/3.5"/>
-
-    <release-date>1995-05-30</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/4.0";>
-    <short-id>winnt4.0</short-id>
-    <_name>Microsoft Windows NT Server 4.0</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>4.0</version>
-    <upgrades id="http://microsoft.com/winnt/3.51"/>
-    <derives-from id="http://microsoft.com/winnt/3.51"/>
-
-    <release-date>1996-08-24</release-date>
-    <eol-date>2004-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/95";>
-    <short-id>win95</short-id>
-    <_name>Microsoft Windows 95</_name>
-    <version>4.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <upgrades id="http://microsoft.com/win/3.1"/>
-    <derives-from id="http://microsoft.com/win/3.1"/>
-
-    <release-date>1995-08-24</release-date>
-    <eol-date>2001-12-13</eol-date>
-
-    <devices>
-      <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">
-      <minimum>
-        <cpu>12000000</cpu>
-        <ram>4194304</ram>
-        <storage>41943040</storage>
-      </minimum>
-    </resources>
-  </os>
-
-  <os id="http://microsoft.com/win/98";>
-    <short-id>win98</short-id>
-    <_name>Microsoft Windows 98</_name>
-    <version>4.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/95"/>
-    <upgrades id="http://microsoft.com/win/95"/>
-
-    <release-date>1998-06-25</release-date>
-    <eol-date>2006-07-11</eol-date>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>66000000</cpu>
-        <ram>16777216</ram>
-        <storage>125829120</storage>
-      </minimum>
-      <recommended>
-        <cpu>233000000</cpu>
-        <ram>25165824</ram>
-        <storage>419430400</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://microsoft.com/win/me";>
-    <short-id>winme</short-id>
-    <_name>Microsoft Windows Millennium Edition</_name>
-    <version>4.9</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/98"/>
-    <upgrades id="http://microsoft.com/win/98"/>
-
-    <release-date>2000-09-14</release-date>
-    <eol-date>2006-07-11</eol-date>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>150000000</cpu>
-        <ram>33554432</ram>
-        <storage>335544320</storage>
-      </minimum>
-      <recommended>
-        <cpu>300000000</cpu>
-        <ram>67108864</ram>
-        <storage>2147483648</storage>
-      </recommended>
-    </resources>
-  </os>
-
-
-  <os id="http://microsoft.com/win/2k";>
-    <short-id>win2k</short-id>
-    <_name>Microsoft Windows 2000</_name>
-    <version>5.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/me"/>
-
-    <release-date>2000-02-17</release-date>
-    <eol-date>2010-07-13</eol-date>
-
-    <devices>
-      <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">
-      <iso>
-          <volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
-          <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>33554432</ram>
-        <storage>335544320</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>350000000</cpu>
-        <ram>100663296</ram>
-        <storage>1073741824</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-    </installer>
-  </os>
-
-
-  <os id="http://microsoft.com/win/xp";>
-    <short-id>winxp</short-id>
-    <_name>Microsoft Windows XP</_name>
-    <version>5.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k"/>
-    <derives-from id="http://microsoft.com/win/me"/>
-    <upgrades id="http://microsoft.com/win/me"/>
-
-    <release-date>2001-10-25</release-date>
-    <eol-date>2009-04-19</eol-date>
-
-    <media arch="i686" installer-reboots="2">
-      <iso>
-        <volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <media arch="x86_64" installer-reboots="2">
-      <iso>
-        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>233000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>1610612736</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>300000000</cpu>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>733000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>268435456</ram>
-        <storage>1610612736</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>733000000</cpu>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/x86"; pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <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://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">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <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://pcisig.com/pci/1af4/1001"/>
-    </driver>
-
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <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">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <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>
-
-  <os id="http://microsoft.com/win/2k3";>
-    <short-id>win2k3</short-id>
-    <_name>Microsoft Windows Server 2003</_name>
-    <version>5.2</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k"/>
-    <upgrades id="http://microsoft.com/win/2k"/>
-
-    <release-date>2003-04-24</release-date>
-    <eol-date>2015-07-14</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="ia64">
-      <iso>
-        <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>2147483648</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>550000000</cpu>
-        <ram>268435456</ram>
-        <storage>4294967296</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>4294967296</storage>
-      </minimum>
-
-      <recommended>
-        <storage>8589934592</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k3r2";>
-    <short-id>win2k3r2</short-id>
-    <_name>Microsoft Windows Server 2003 R2</_name>
-    <version>5.2</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k3"/>
-    <upgrades id="http://microsoft.com/win/2k3"/>
-
-    <release-date>2005-12-06</release-date>
-    <eol-date>2015-07-14</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>2147483648</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>550000000</cpu>
-        <ram>268435456</ram>
-        <storage>4294967296</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>4294967296</storage>
-      </minimum>
-
-      <recommended>
-        <storage>8589934592</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k8";>
-    <short-id>win2k8</short-id>
-    <_name>Microsoft Windows Server 2008</_name>
-    <version>6.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k3r2"/>
-    <upgrades id="http://microsoft.com/win/2k3r2"/>
-
-    <release-date>2008-02-27</release-date>
-    <eol-date>2013-07-09</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1400000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k8r2";>
-    <short-id>win2k8r2</short-id>
-    <_name>Microsoft Windows Server 2008 R2</_name>
-    <version>6.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k8"/>
-    <upgrades id="http://microsoft.com/win/2k8"/>
-
-    <release-date>2009-10-22</release-date>
-    <eol-date>2013-07-09</eol-date>
-
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="ia64">
-      <iso>
-        <volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1400000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/vista";>
-    <short-id>winvista</short-id>
-    <_name>Microsoft Windows Vista</_name>
-    <version>6.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/xp"/>
-    <upgrades id="http://microsoft.com/win/xp"/>
-
-    <release-date>2006-11-30</release-date>
-    <eol-date>2012-04-10</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMEXVOL|FRTMEXVOL|FRMBXVOL|FRMCXFRE)_</volume-id>
-       <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-
-    <resources arch="all">
-      <minimum>
-        <cpu>800000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>16106127360</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/7";>
-    <short-id>win7</short-id>
-    <_name>Microsoft Windows 7</_name>
-    <version>6.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/vista"/>
-    <upgrades id="http://microsoft.com/win/vista"/>
-
-    <release-date>2009-10-22</release-date>
-    <eol-date>2015-01-13</eol-date>
-
-    <variant id="debug">
-      <_name>Microsoft Windows 7 Debug Checked Build</_name>
-    </variant>
-    <variant id="starter">
-      <_name>Microsoft Windows 7 Starter</_name>
-    </variant>
-    <variant id="home-basic">
-      <_name>Microsoft Windows 7 Home Basic</_name>
-    </variant>
-    <variant id="home-premium">
-      <_name>Microsoft Windows 7 Home Premium</_name>
-    </variant>
-    <variant id="professional">
-      <_name>Microsoft Windows 7 Professional</_name>
-    </variant>
-    <variant id="enterprise">
-      <_name>Microsoft Windows 7 Enterprise</_name>
-    </variant>
-    <variant id="ultimate">
-      <_name>Microsoft Windows 7 Ultimate</_name>
-    </variant>
-
-    <!-- Debug -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(GRMCCHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(GRMCXCHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Starter -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="starter"/>
-      <iso>
-        <volume-id>(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Home Basic -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="home-basic"/>
-      <iso>
-        <volume-id>(GSP1RMCHBFRER|GRMCHBFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Home Premium -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="home-premium"/>
-      <iso>
-        <volume-id>(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="home-premium"/>
-      <iso>
-        <volume-id>(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Professional -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GSP1RMCNENXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Ultimate -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="ultimate"/>
-      <iso>
-        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="ultimate"/>
-      <iso>
-        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GSP1RMCULXFRER|GRMCNULXFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Variant unknown -->
-    <media arch="i686" installer-reboots="2">
-      <iso>
-        <volume-id>(GRMCPRFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <iso>
-        <volume-id>(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
-    </devices>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/x86"; pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <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://pcisig.com/pci/1af4/1001"/>
-    </driver>
-
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst"; signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <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">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <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>
-
-  <os id="http://microsoft.com/win/8";>
-    <short-id>win8</short-id>
-    <_name>Microsoft Windows 8</_name>
-    <version>6.2</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/7"/>
-    <upgrades id="http://microsoft.com/win/7"/>
-
-<!--
-    <release-date></release-date>
-    <eol-date></eol-date>
--->
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(HB1_CCPA_X86FRE|HRM_CCSA_X86FRE|HRM_CCSA_X86CHK|HRM_CCSNA_X86CHK|HRM_CCSNA_X86FRE|HRM_CENA_X86FREV|HRM_CENA_X86CHKV|HRM_CENNA_X86FREV|HRM_CENNA_X86CHKV|HRM_CPRA_X86FREV|HRM_CPRNA_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(HB1_CCPA_X64FRE|HRM_CCSA_X64FRE|HRM_CCSA_X64CHK|HRM_CCSNA_X64FRE|HRM_CCSNA_X64CHK|HRM_CENNA_X64FREV|HRM_CENNA_X64CHKV|HRM_CENA_X64FREV|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
-    </devices>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/8.1";>
-    <short-id>win8.1</short-id>
-    <_name>Microsoft Windows 8.1</_name>
-    <version>6.3</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/8"/>
-    <upgrades id="http://microsoft.com/win/8"/>
-
-<!--
-    <release-date></release-date>
-    <eol-date></eol-date>
--->
-
-    <variant id="debug">
-      <_name>Microsoft Windows 8.1 Debug Checked Build</_name>
-    </variant>
-    <variant id="enterprise-debug">
-      <_name>Microsoft Windows 8.1 Enterprise Debug Checked Build</_name>
-    </variant>
-    <variant id="professional">
-      <_name>Microsoft Windows 8.1 Professional</_name>
-    </variant>
-    <variant id="enterprise">
-      <_name>Microsoft Windows 8.1 Enterprise</_name>
-    </variant>
-
-    <!-- Debug -->
-    <media arch="i686">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(IRM_CCSN?A_X86CHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(IRM_CCSN?A_X64CHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise Debug -->
-    <media arch="i686">
-      <variant id="enterprise-debug"/>
-      <iso>
-        <volume-id>(IRM_CENN?A_X86CHKV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="enterprise-debug"/>
-      <iso>
-        <volume-id>(IRM_CENN?A_X64CHKV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Professional -->
-    <media arch="i686">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(IR1_CPRN?A_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(IR1_CPRN?A_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise -->
-    <media arch="i686">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(IR1_CENNA_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(IR[135]_CENN?A_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- No variant -->
-    <media arch="i686">
-      <iso>
-        <volume-id>(IR5_CCSNA_X86FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Variant unknown -->
-    <media arch="i686">
-      <iso>
-        <volume-id>(IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE|IR3_CENA_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
-    </devices>
-  </os>
-
-  <os id="http://microsoft.com/win/2k12";>
-    <short-id>win2k12</short-id>
-    <_name>Microsoft Windows Server 2012</_name>
-    <version>6.3</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k8r2"/>
-    <upgrades id="http://microsoft.com/win/2k8r2"/>
-
-    <release-date>2012-09-04</release-date>
-
-    <variant id="storage">
-      <_name>Windows Server 2012 Storage</_name>
-    </variant>
-    <variant id="hyperv">
-      <_name>Windows Server 2012 for HyperV</_name>
-    </variant>
-    <variant id="essentials">
-      <_name>Windows Server 2012 Essentials</_name>
-    </variant>
-    <variant id="volume-license">
-      <_name>Windows Server 2012 Volume License</_name>
-    </variant>
-
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <media arch="x86_64">
-      <variant id="essentials"/>
-      <iso>
-        <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="hyperv"/>
-      <iso>
-        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="storage"/>
-      <iso>
-        <volume-id>(HRM_SFST_X64FREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="volume-licence"/>
-      <iso>
-        <volume-id>(HRM_SSS_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://microsoft.com/win/2k12r2";>
-    <short-id>win2k12r2</short-id>
-    <_name>Microsoft Windows Server 2012 R2</_name>
-    <version>6.3</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k12"/>
-    <upgrades id="http://microsoft.com/win/2k12"/>
-
-    <variant id="storage">
-      <_name>Windows Server 2012 R2 Storage</_name>
-    </variant>
-    <variant id="hyperv">
-      <_name>Windows Server 2012 R2 for HyperV</_name>
-    </variant>
-    <variant id="essentials">
-      <_name>Windows Server 2012 R2 Essentials</_name>
-    </variant>
-    <variant id="volume-license">
-      <_name>Windows Server 2012 R2 Volume License</_name>
-    </variant>
-
-    <release-date>2013-10-18</release-date>
-
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="essentials"/>
-      <iso>
-        <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="hyperv"/>
-      <iso>
-        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="volume-licence"/>
-      <iso>
-        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="storage"/>
-      <iso>
-        <volume-id>(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://microsoft.com/win/10";>
-    <short-id>win10</short-id>
-    <_name>Microsoft Windows 10</_name>
-    <version>10.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/8.1"/>
-    <upgrades id="http://microsoft.com/win/8.1"/>
-
-    <release-date>2015-07-29</release-date>
-
-    <variant id="education">
-      <_name>Microsoft Windows 10 Education</_name>
-    </variant>
-    <variant id="enterprise">
-      <_name>Microsoft Windows 10 Enterprise</_name>
-    </variant>
-
-    <!-- Education -->
-    <media arch="i686">
-      <variant id="education"/>
-      <iso>
-        <volume-id>J_CEDA_X86FRE_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise -->
-    <media arch="i686">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>J_CENA_X86FREV_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language";>[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pcisig.com/pci/8086/2668"/> <!-- ICH6 -->
-    </devices>
-  </os>
-
-</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 823aaee..7899ac2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -146,6 +146,30 @@ data/oses/mandriva.com/mbs-1.0.xml.in
 data/oses/mandriva.com/mes-5.0.xml.in
 data/oses/mandriva.com/mes-5.1.xml.in
 data/oses/microsoft.com/msdos-6.22.xml.in
+data/oses/microsoft.com/win-1.0.xml.in
+data/oses/microsoft.com/win-10.xml.in
+data/oses/microsoft.com/win-2.0.xml.in
+data/oses/microsoft.com/win-2.1.xml.in
+data/oses/microsoft.com/win-2k12r2.xml.in
+data/oses/microsoft.com/win-2k12.xml.in
+data/oses/microsoft.com/win-2k3r2.xml.in
+data/oses/microsoft.com/win-2k3.xml.in
+data/oses/microsoft.com/win-2k8r2.xml.in
+data/oses/microsoft.com/win-2k8.xml.in
+data/oses/microsoft.com/win-2k.xml.in
+data/oses/microsoft.com/win-3.1.xml.in
+data/oses/microsoft.com/win-7.xml.in
+data/oses/microsoft.com/win-8.1.xml.in
+data/oses/microsoft.com/win-8.xml.in
+data/oses/microsoft.com/win-95.xml.in
+data/oses/microsoft.com/win-98.xml.in
+data/oses/microsoft.com/win-me.xml.in
+data/oses/microsoft.com/winnt-3.1.xml.in
+data/oses/microsoft.com/winnt-3.51.xml.in
+data/oses/microsoft.com/winnt-3.5.xml.in
+data/oses/microsoft.com/winnt-4.0.xml.in
+data/oses/microsoft.com/win-vista.xml.in
+data/oses/microsoft.com/win-xp.xml.in
 data/oses/netbsd.org/netbsd-0.8.xml.in
 data/oses/netbsd.org/netbsd-0.9.xml.in
 data/oses/netbsd.org/netbsd-1.0.xml.in
@@ -306,7 +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/oses/windows.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
-- 
2.4.3

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux