From ada4e29290c859417fcd6d06d040bcaeb1558b98 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Sat, 26 Oct 2024 20:13:52 +0000
Subject: [PATCH] Enable QXL device build

---
 2002-Enable-QXL-device-build.patch | 21 +++++++++++++++++++++
 qemu-kvm.spec                      |  9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 2002-Enable-QXL-device-build.patch

diff --git a/2002-Enable-QXL-device-build.patch b/2002-Enable-QXL-device-build.patch
new file mode 100644
index 0000000..862fc46
--- /dev/null
+++ b/2002-Enable-QXL-device-build.patch
@@ -0,0 +1,21 @@
+From 32c5296efbb9e9a4e7ede9591e37bd307f3b1ced Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 26 Oct 2024 20:09:06 +0000
+Subject: [PATCH] Enable QXL device build
+
+---
+ configs/devices/x86_64-softmmu/x86_64-rh-devices.mak | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
+index 45a8a1529..2769c1eb4 100644
+--- a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
++++ b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
+@@ -112,3 +112,4 @@ CONFIG_VHOST_USER_VSOCK=y
+ CONFIG_VHOST_USER_FS=y
+ CONFIG_IOMMUFD=y
+ CONFIG_VHOST_USER_SND=y
++CONFIG_QXL=y
+-- 
+2.43.5
+
diff --git a/qemu-kvm.spec b/qemu-kvm.spec
index b3a1a5d..c146989 100644
--- a/qemu-kvm.spec
+++ b/qemu-kvm.spec
@@ -157,7 +157,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version}                    \
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 9.1.0
-Release: 3%{?rcrel}%{?dist}%{?cc_suffix}.alma.2
+Release: 3%{?rcrel}%{?dist}%{?cc_suffix}.alma.3
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 # Epoch 15 used for RHEL 8
 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5)
@@ -255,6 +255,7 @@ Patch35: kvm-hostmem-Apply-merge-property-after-the-memory-region.patch
 
 # AlmaLinux patches
 Patch2001: 2001-Add-ppc64-support.patch
+Patch2002: 2002-Enable-QXL-device-build.patch
 
 %if %{have_clang}
 BuildRequires: clang
@@ -1331,6 +1332,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
     %{_libdir}/%{name}/audio-spice.so
     %{_libdir}/%{name}/ui-spice-core.so
     %{_libdir}/%{name}/chardev-spice.so
+%ifarch x86_64
+    %{_libdir}/%{name}/hw-display-qxl.so
+%endif
 %endif
 
 %if %{have_opengl}
@@ -1358,6 +1362,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %endif
 
 %changelog
+* Sat Oct 26 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 9.1.0-3.alma.3
+- Enable QXL device build
+
 * Mon Oct 14 2024 Eduard Abdullin <eabdullin@almalinux.org> - 9.1.0-3.alma.2
 - Enable building for ppc64le
 - Re-added Spice support