8 changed files with 89 additions and 99 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,16 +1,14 @@
-SOURCES/mingw-qemu-ga-win-106.0.1-1.el9.src.rpm
-SOURCES/qemu-ga-win-106.0.1-1.el9.noarch.rpm
+SOURCES/mingw-qemu-ga-win-102.10.0-0.el8_5.src.rpm
+SOURCES/qemu-ga-win-102.10.0-0.el8_5.noarch.rpm
 SOURCES/qxl-win-unsigned-0.1-24-sources.zip
 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm
 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm
 SOURCES/spice-vdagent-win-0.10.0-5.el8.src.rpm
 SOURCES/spice-vdagent-win-x64-0.10.0-5.el8.noarch.rpm
 SOURCES/spice-vdagent-win-x86-0.10.0-5.el8.noarch.rpm
-SOURCES/virtio-win-1.9.35-bin-for-rpm.tar.gz
+SOURCES/virtio-win-1.9.24-bin-for-rpm.tar.gz
 SOURCES/virtio-win-gt-x64.msi
 SOURCES/virtio-win-gt-x86.msi
 SOURCES/virtio-win-guest-tools.exe
-SOURCES/virtio-win-installer-1.9.35-0-sources.zip
-SOURCES/virtio-win-prewhql-0.1-240-sources.zip
-SOURCES/winfsp-1.12.22339-sources.zip
-SOURCES/winfsp-1.12.22339.msi
+SOURCES/virtio-win-installer-1.9.19-11-sources.zip
+SOURCES/virtio-win-prewhql-0.1-215-sources.zip
--- a/.virtio-win.metadata
+++ b/.virtio-win.metadata
@ -1,16 +1,14 @@
-82c187edce788f5968c227cc1da3db001250c35d SOURCES/mingw-qemu-ga-win-106.0.1-1.el9.src.rpm
-27ab2810f7ad43b9a6348d10b2d09142ab0be776 SOURCES/qemu-ga-win-106.0.1-1.el9.noarch.rpm
+90289233838c449e4d386071c1d18f707abf2b32 SOURCES/mingw-qemu-ga-win-102.10.0-0.el8_5.src.rpm
+c5dabada049d2b79c9d4f84f4da025f742d1522e SOURCES/qemu-ga-win-102.10.0-0.el8_5.noarch.rpm
 1cb09750a3a1965a147889f5db3ec7b8feb005b8 SOURCES/qxl-win-unsigned-0.1-24-sources.zip
 95dab7088166ba71366bcbcb099267d771d61661 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm
 055c8fe47a378ef48b89846ba9c2474238ad9aea SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm
 085728c7db3503db1f7c8f1d264ca45b365d6837 SOURCES/spice-vdagent-win-0.10.0-5.el8.src.rpm
 fb35d3c12b9069133e651f54c35ae6ee68537959 SOURCES/spice-vdagent-win-x64-0.10.0-5.el8.noarch.rpm
 2d4bd6f8fb1b306f4d49a5a990e2da9c5f5baeac SOURCES/spice-vdagent-win-x86-0.10.0-5.el8.noarch.rpm
-e0cb9d972c38cec824cc4d84b54110ae54f5cfba SOURCES/virtio-win-1.9.35-bin-for-rpm.tar.gz
-756bab2368d28ec936af496a8a3e9723a50ffc35 SOURCES/virtio-win-gt-x64.msi
-33159bbbb6242fec2425634ab78472167580d206 SOURCES/virtio-win-gt-x86.msi
-97f1f48ec0ea0bb449dad57227b458024e7dd441 SOURCES/virtio-win-guest-tools.exe
-0621a23248ae02eba9d1efde00d6abd7196acfdf SOURCES/virtio-win-installer-1.9.35-0-sources.zip
-cb231b467e637e938529c5f75512cf1e6eb9ee8a SOURCES/virtio-win-prewhql-0.1-240-sources.zip
-151e6a4b1d429c5bbb768f4aee51055708832ae5 SOURCES/winfsp-1.12.22339-sources.zip
-ced3777f88438097ee0f4fc94ac951e4d2f2b602 SOURCES/winfsp-1.12.22339.msi
+2f867f7df39cd09eda0394bba2bad3acdca66896 SOURCES/virtio-win-1.9.24-bin-for-rpm.tar.gz
+dc30b8fbe610b4fcd61e2cf9f0f78a14f7fc74e7 SOURCES/virtio-win-gt-x64.msi
+edc97400b32296fafde8179e83f5a39582772354 SOURCES/virtio-win-gt-x86.msi
+42a233ba04a7ea7ec57d9d24d753e4fdfaa78461 SOURCES/virtio-win-guest-tools.exe
+7290fe32a462de46cbc2404d69c1a3e9788f6bb6 SOURCES/virtio-win-installer-1.9.19-11-sources.zip
+55504e151e1d76fe3208328a2d3c871f149c4d33 SOURCES/virtio-win-prewhql-0.1-215-sources.zip
--- a/SOURCES/agents.json
+++ b/SOURCES/agents.json
@ -2,12 +2,12 @@
  "agents": [
    {
      "arch": "x86",
-      "agent_version": "106.0.1-1",
+      "agent_version": "102.10.0-0",
      "name": "Red Hat QEMU guest agent"
    },
    {
      "arch": "amd64",
-      "agent_version": "106.0.1-1",
+      "agent_version": "102.10.0-0",
      "name": "Red Hat QEMU guest agent"
    },
    {
--- a/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
@ -44,9 +44,8 @@
      <file>pvpanic.inf</file>
      <file>pvpanic.sys</file>

-      <file>fwcfg64.cat</file>
-      <file>fwcfg64.inf</file>
-      <file>fwcfg64.sys</file>
+      <file>qemufwcfg.cat</file>
+      <file>qemufwcfg.inf</file>

      <file>qemupciserial.cat</file>
      <file>qemupciserial.inf</file>
@ -117,9 +116,8 @@
      <file>pvpanic.inf</file>
      <file>pvpanic.sys</file>

-      <file>fwcfg64.cat</file>
-      <file>fwcfg64.inf</file>
-      <file>fwcfg64.sys</file>
+      <file>qemufwcfg.cat</file>
+      <file>qemufwcfg.inf</file>

      <file>qemupciserial.cat</file>
      <file>qemupciserial.inf</file>
--- a/SOURCES/virtio-win-pre-installable-drivers-win-11.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-11.xml
@ -44,9 +44,8 @@
      <file>pvpanic.inf</file>
      <file>pvpanic.sys</file>

-      <file>fwcfg64.cat</file>
-      <file>fwcfg64.inf</file>
-      <file>fwcfg64.sys</file>
+      <file>qemufwcfg.cat</file>
+      <file>qemufwcfg.inf</file>

      <file>qemupciserial.cat</file>
      <file>qemupciserial.inf</file>
--- a/SOURCES/virtio-win-pre-installable-drivers-win-8.1.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-8.1.xml
@ -86,11 +86,6 @@
      <file>viofs.inf</file>
      <file>viofs.sys</file>
      <device id="http://pcisig.com/pci/1af4/105a"/>
-
-      <file>viogpudo.cat</file>
-      <file>viogpudo.inf</file>
-      <file>viogpudo.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
    </driver>

    <driver signed="true" pre-installable="true" location="file:///usr/share/virtio-win/drivers/by-os/amd64/w8.1/" arch="x86_64">
@ -113,10 +108,6 @@
      <file>pvpanic.inf</file>
      <file>pvpanic.sys</file>

-      <file>fwcfg64.cat</file>
-      <file>fwcfg64.inf</file>
-      <file>fwcfg64.sys</file>
-
      <file>qemupciserial.cat</file>
      <file>qemupciserial.inf</file>

@ -156,11 +147,6 @@
      <file>viofs.inf</file>
      <file>viofs.sys</file>
      <device id="http://pcisig.com/pci/1af4/105a"/>
-
-      <file>viogpudo.cat</file>
-      <file>viogpudo.inf</file>
-      <file>viogpudo.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
    </driver>
  </os>
 </libosinfo>
--- a/SOURCES/virtio-win-pre-installable-drivers-win-8.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-8.xml
@ -88,11 +88,6 @@
      <file>viofs.inf</file>
      <file>viofs.sys</file>
      <device id="http://pcisig.com/pci/1af4/105a"/>
-
-      <file>viogpudo.cat</file>
-      <file>viogpudo.inf</file>
-      <file>viogpudo.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
    </driver>

    <driver signed="true" pre-installable="true" location="file:///usr/share/virtio-win/drivers/by-os/amd64/w8/" arch="x86_64">
@ -115,10 +110,6 @@
      <file>pvpanic.inf</file>
      <file>pvpanic.sys</file>

-      <file>fwcfg64.cat</file>
-      <file>fwcfg64.inf</file>
-      <file>fwcfg64.sys</file>
-
      <file>qemupciserial.cat</file>
      <file>qemupciserial.inf</file>

@ -158,11 +149,6 @@
      <file>viofs.inf</file>
      <file>viofs.sys</file>
      <device id="http://pcisig.com/pci/1af4/105a"/>
-
-      <file>viogpudo.cat</file>
-      <file>viogpudo.inf</file>
-      <file>viogpudo.sys</file>
-      <device id="http://pcisig.com/pci/1af4/1050"/>
    </driver>
  </os>
 </libosinfo>
--- a/SPECS/virtio-win.spec
+++ b/SPECS/virtio-win.spec
@ -8,25 +8,37 @@
 # If you make any changes to this file that affect the RPM content (but not
 # version numbers or changelogs, etc), submit a patch to the upstream spec.

-%global virtio_win_prewhql_build virtio-win-prewhql-0.1-240
-%global qemu_ga_win_build qemu-ga-win-106.0.1-1.el9
+%global virtio_win_prewhql_build virtio-win-prewhql-0.1-215
+%global qemu_ga_win_build qemu-ga-win-102.10.0-0.el8_5
 %global qxl_build qxl-win-unsigned-0.1-24
 %global spice_vdagent_build 0.10.0-5.el8
 %global qxlwddm_build spice-qxl-wddm-dod-0.21-2.el8

-%global windows_installer_version -1.9.35-0
-%global winfsp_version -1.12.22339
+%global windows_installer_version -1.9.19-11

 Summary: VirtIO para-virtualized drivers for Windows(R)
 Name: virtio-win
-Version: 1.9.35
-Release: 0%{?dist}
+Version: 1.9.24
+Release: 2%{?dist}
 Group: Applications/System
-License: Apache-2.0 AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later
 URL: http://www.redhat.com/
 BuildArch: noarch

-# Already built/ files
+%if 0%{?rhel}
+# RHEL RPM ships WHQL signed drivers, which are under a proprietary license
+# qemu-ga builds are GPLv2
+License: Red Hat Proprietary and BSD-3-Clause and Apache and GPLv2
+%else
+# virtio-win drivers are licensed under the BSD license, qxldod under Apache,
+# everything else is GPLv2
+# virtio-win: https://github.com/virtio-win/kvm-guest-drivers-windows/blob/master/LICENSE
+# qxl: http://cgit.freedesktop.org/spice/win32/qxl/tree/xddm/COPYING
+# qxldod: https://github.com/vrozenfe/qxl-dod/blob/master/LICENSE
+# qemu-ga: http://git.qemu.org/?p=qemu.git;a=blob;f=COPYING
+License: BSD and Apache and GPLv2
+%endif
+
+# Already built files
 Source1: %{name}-%{version}-bin-for-rpm.tar.gz
 Source2: %{qemu_ga_win_build}.noarch.rpm

@ -39,8 +51,6 @@ Source7: %{qxlwddm_build}.noarch.rpm
 Source8: spice-vdagent-win-%{spice_vdagent_build}.src.rpm
 Source9: spice-vdagent-win-x64-%{spice_vdagent_build}.noarch.rpm
 Source10: spice-vdagent-win-x86-%{spice_vdagent_build}.noarch.rpm
-Source11: winfsp%{winfsp_version}-sources.zip
-

 Source20: virtio-win-guest-tools.exe
 Source21: virtio-win-gt-x86.msi
@ -50,7 +60,6 @@ Source23: virtio-win-guest-tools-installer-%{version}.tar.gz
 %else
 Source23: virtio-win-installer%{windows_installer_version}-sources.zip
 %endif
-Source24: winfsp%{winfsp_version}.msi

 %if 0%{?rhel}
 Source70: virtio-win-pre-installable-drivers-win-7.xml
@ -107,7 +116,6 @@ popd
 %{__cp} %{SOURCE20} iso-content/
 %{__cp} %{SOURCE21} iso-content/
 %{__cp} %{SOURCE22} iso-content/
-%{__cp} %{SOURCE24} iso-content/


 %if 0%{?rhel} > 7
@ -140,8 +148,6 @@ pushd iso-content
    -o ../media/%{name}-%{version}.iso \
    -r -iso-level 4 \
    -input-charset iso8859-1 \
-    -allow-lowercase \
-    -relaxed-filenames \
    -V "%{name}-%{version}" .
 popd

@ -208,7 +214,7 @@ add_link _servers_amd64.vfd
 %{__install} -p -m0644 iso-content/virtio-win-guest-tools.exe %{buildroot}%{_datadir}/%{name}/installer/
 %{__install} -p -m0644 iso-content/virtio-win-gt-x86.msi %{buildroot}%{_datadir}/%{name}/installer/
 %{__install} -p -m0644 iso-content/virtio-win-gt-x64.msi  %{buildroot}%{_datadir}/%{name}/installer/
-%{__install} -p -m0644 iso-content/winfsp%{winfsp_version}.msi %{buildroot}%{_datadir}/%{name}/installer/
+

 %files
 %doc iso-content/virtio-win_license.txt
@ -239,7 +245,6 @@ add_link _servers_amd64.vfd
 %{_datadir}/%{name}/drivers/by-driver/sriov
 %{_datadir}/%{name}/drivers/by-driver/qxldod
 %{_datadir}/%{name}/drivers/by-driver/viogpudo
-%{_datadir}/%{name}/drivers/by-driver/fwcfg
 %exclude %{_datadir}/%{name}/drivers/by-driver/virtio-win_license.txt
 %if 0%{?fedora}
 %{_datadir}/%{name}/drivers/by-driver/smbus
@ -273,41 +278,61 @@ add_link _servers_amd64.vfd
 %endif

 %changelog
-* Sun Aug 27 2023 Vadim Rozenfeld <vrozenfe@redhat.com>
- Update installer 1.9.35.0 with the latest agents RHEL-9.3.0
- Related: #420
+* Fri Jan 14 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.24-2.el8
+- Update installer to 1.0.19.11
+- Resolves: rhbz#2033400

-* Sat Jul 10 2023 Vadim Rozenfeld <vrozenfe@redhat.com>
- Update installer 1.9.34.0 with the latest agents RHEL-9.3.0
- Related: #420
+* Thu Jan 13 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.22-4.el8
+- Update installer to 1.0.19.10
+- Resolves: rhbz#2033400

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Jan 08 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.22-2.el8
+- Update installer to 1.0.19.5
+- Resolves: rhbz#2033400

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Jan 07 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.22-1.el8
+- Update installer to 1.0.19.5
+- Resolves: rhbz#2033400

-* Wed Jan 20 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.15-2.el9
- This is a plain copy of the virtio-win package released in RHEL-8.3.1 for RHEL-9.0.0
- Resolves: rhbz#1916284
+* Wed Dec 29 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.21-1.el8
+- Update installer to 1.0.19.4
+- Resolves: rhbz#2033400

-* Tue Jan 19 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.15-1.el9
- This is a plain copy of the virtio-win package released in RHEL-8.3.1 for RHEL-9.0.0
- Resolves: rhbz#1916284
+* Sun Dec 19 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.20-3.el8
+- Update installer to 1.0.19.2
+- Resolves: rhbz#2033400

-* Tue Jan 5 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.15-0.el8
- Update to build 191 
- Update installer 1.9.15.1 with the latest agents and drivers
- Resolves: rhbz#1911903
+* Tue Dec 14 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.20-2.el8
+- Update installer to 1.0.19.1
+- Resolves: rhbz#2033400

-* Fri Sep 25 2020 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.14-4.el8
- Update installer 1.9.14.2 with the latest agents
- Resolves: rhbz#1746667
+* Sun Sep 12 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.19-1.el8
+- update to build 208
+- Resolves: rhbz#1996949

-* Wed Sep 23 2020 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.14-3.el8
- Update installer 1.9.14.2
- Resolves: rhbz#1746667
+* Sun Sep 12 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.18-4.el8
+- update to build 208
+- Resolves: rhbz#1996949
+
+* Wed Sep 8 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.18-3.el8
+- update installer to 1.9.18.3
+- Resolves: rhbz#1996949
+
+* Fri Sep 3 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.18-2.el8
+- update installer to 1.9.18.2
+- Resolves: rhbz#1996949
+
+* Wed Sep 1 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.18-1.el8
+- Update installer to 1.0.18.1
+- Resolves: rhbz#1996949
+
+* Tue Feb 9 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.16-1.el8
+- Add qxldod to xml pci devices database
+- Resolves: rhbz#1902635
+
+* Mon Feb 8 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.16-0.el8
+- Add qxldod to virtio-win iso
+- Resolves: rhbz#1902635

 * Mon Sep 21 2020 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.14-2.el8
 - Update installer 1.9.14.1