From d73453fa2823bc76a9d26f3d4a06ea2b2e115e41 Mon Sep 17 00:00:00 2001
From: Roberto Campesato <render@metalabs.org>
Date: Oct 15 2024 10:20:59 +0000
Subject: Merge remote-tracking branch 'upstream/rawhide' into fix-qemu-guest-agent


---

diff --git a/qemu-ga.sysconfig b/qemu-ga.sysconfig
index 42a818a..aea1ccb 100644
--- a/qemu-ga.sysconfig
+++ b/qemu-ga.sysconfig
@@ -3,7 +3,7 @@
 
 # Comma-separated blacklist of RPCs to disable, or empty list to enable all.
 #
-# You can get the list of RPC commands using "qemu-ga --blacklist='?'".
+# You can get the list of RPC commands using "qemu-ga -b '?'".
 # There should be no spaces between commas and commands in the blacklist.
 #BLACKLIST_RPC=guest-file-open,guest-file-close,guest-file-read,guest-file-write,guest-file-seek,guest-file-flush,guest-exec,guest-exec-status
 
diff --git a/qemu-guest-agent.service b/qemu-guest-agent.service
index b3157d5..0d89bb2 100644
--- a/qemu-guest-agent.service
+++ b/qemu-guest-agent.service
@@ -10,7 +10,7 @@ EnvironmentFile=/etc/sysconfig/qemu-ga
 ExecStart=/usr/bin/qemu-ga \
   --method=virtio-serial \
   --path=/dev/virtio-ports/org.qemu.guest_agent.0 \
-  --blacklist=${BLACKLIST_RPC} \
+  -b ${BLACKLIST_RPC} \
   -F${FSFREEZE_HOOK_PATHNAME}
 Restart=always
 RestartSec=0
diff --git a/qemu.spec b/qemu.spec
index 35f7768..b9ee3f3 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -99,7 +99,7 @@
 %endif
 
 %global have_virgl 0
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos_hs}
 %global have_virgl 1
 %endif
 
@@ -365,7 +365,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38
 %endif
 
 # To prevent rpmdev-bumpspec breakage
-%global baserelease 1
+%global baserelease 2
 
 # Hyperscale release
 %global hsrel .1
@@ -3172,6 +3172,13 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Mon Oct 14 2024 Roberto Campesato <render@metalabs.org> - 2:9.1.0-2.1
+- Merge latest changes from Fedora
+- Enable virgl for Hyperscale
+
+* Mon Sep 16 2024 Richard W.M. Jones <rjones@redhat.com> - 2:9.1.0-2
+- Replace qemu --blacklist option with -b (related: RHBZ#2258100)
+
 * Wed Sep 11 2024 Roberto Campesato <render@metalabs.org> - 9.1.0-1.1
 - Merge latest changes from Fedora
 - Added fb-only patch based on experimental AMD changes for SEV/SNP