* Tue Feb 12 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 3.1.0-14.el8

- kvm-doc-fix-the-configuration-path.patch [bz#1644985]
- Resolves: bz#1644985
  (The "fsfreeze-hook" script path shown by command "qemu-ga --help" or "man qemu-ga" is wrong - Fast Train)

kvm-doc-fix-the-configuration-path.patch

@@ -0,0 +1,80 @@
+From a02908747e85b4064da8acabe724f9202ab17fba Mon Sep 17 00:00:00 2001
+From: Danilo de Paula <ddepaula@redhat.com>
+Date: Fri, 8 Feb 2019 11:51:14 +0000
+Subject: [PATCH] doc: fix the configuration path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RH-Author: Danilo de Paula <ddepaula@redhat.com>
+Message-id: <20190208115114.24850-2-ddepaula@redhat.com>
+Patchwork-id: 84320
+O-Subject: [RHEL8/rhel qemu-kvm PATCH v2 1/1] doc: fix the configuration path
+Bugzilla: 1644985
+RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
+RH-Acked-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
+
+From: Marc-André Lureau <marcandre.lureau@redhat.com>
+
+Use a CONFDIR variable to show the configured sysconf path in the
+generated documentations (html, man pages etc).
+
+Related to:
+https://bugzilla.redhat.com/show_bug.cgi?id=1644985
+
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
+---
+ Makefile     | 9 ++++++---
+ qemu-ga.texi | 4 ++--
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8710720..24e9ef0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -937,11 +937,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
+ MAKEINFO=makeinfo
+ MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
+ MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
+-TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
++TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
+ TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
+ 
+-docs/version.texi: $(SRC_PATH)/VERSION
+-	$(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
++docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
++	$(call quiet-command,(\
++		echo "@set VERSION $(VERSION)" && \
++		echo "@set CONFDIR $(qemu_confdir)" \
++	)> $@,"GEN","$@")
+ 
+ %.html: %.texi docs/version.texi
+ 	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
+diff --git a/qemu-ga.texi b/qemu-ga.texi
+index 4c7a8fd..f00ad83 100644
+--- a/qemu-ga.texi
++++ b/qemu-ga.texi
+@@ -30,7 +30,7 @@ set user's password
+ @end itemize
+ 
+ qemu-ga will read a system configuration file on startup (located at
+-@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining
++@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining
+ configuration options on the command line. For the same key, the last
+ option wins, but the lists accumulate (see below for configuration
+ file format).
+@@ -58,7 +58,7 @@ file format).
+   Enable fsfreeze hook. Accepts an optional argument that specifies
+   script to run on freeze/thaw. Script will be called with
+   'freeze'/'thaw' arguments accordingly (default is
+-  @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do
++  @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do
+   not follow -F with a space (for example:
+   @samp{-F/var/run/fsfreezehook.sh}).
+ 
+-- 
+1.8.3.1
+

qemu-kvm.spec

@@ -68,7 +68,7 @@ Obsoletes: %1-rhev
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 3.1.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 Epoch: 15
 License: GPLv2 and GPLv2+ and CC-BY
@@ -199,6 +199,8 @@ Patch57: kvm-scsi-disk-Acquire-the-AioContext-in-scsi_-_realize.patch
 # For bz#1656276 - qemu-kvm core dumped after hotplug the deleted disk with iothread parameter
 # For bz#1662508 - Qemu core dump when start guest with two disks using same drive
 Patch58: kvm-virtio-scsi-Forbid-devices-with-different-iothreads-.patch
+# For bz#1644985 - The "fsfreeze-hook" script path shown by command "qemu-ga --help" or "man qemu-ga" is wrong - Fast Train
+Patch59: kvm-doc-fix-the-configuration-path.patch
 
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
@@ -1046,6 +1048,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Tue Feb 12 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 3.1.0-14.el8
+- kvm-doc-fix-the-configuration-path.patch [bz#1644985]
+- Resolves: bz#1644985
+  (The "fsfreeze-hook" script path shown by command "qemu-ga --help" or "man qemu-ga" is wrong - Fast Train)
+
 * Mon Feb 11 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 3.1.0-13.el8
 - kvm-Acceptance-tests-add-Linux-initrd-checking-test.patch [bz#1669922]
 - kvm-mmap-alloc-unfold-qemu_ram_mmap.patch [bz#1671519]