From 48313650a0b12f352d94999e34009dda93047181 Mon Sep 17 00:00:00 2001
From: virtbuilder_pel7ppc64lebuilder0 <virtbuilder@powerel.org>
Date: Fri, 1 May 2020 12:08:49 +0200
Subject: [PATCH] qemu version update 5.0.0 part 2

* add libpmem for vNVDIMM support
* remove hvf from non-native
* add virglrenderer only for x64 (for now)
* add virtiofs package for virtiofs deamon support

Signed-off-by: virtbuilder_pel7ppc64lebuilder0 <virtbuilder@powerel.org>
---
 SPECS/qemu.spec | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/SPECS/qemu.spec b/SPECS/qemu.spec
index d348d99..2e37a6c 100755
--- a/SPECS/qemu.spec
+++ b/SPECS/qemu.spec
@@ -132,6 +132,12 @@ Requires: %{name}-system-x64 = %{version}-%{release}
 This is a meta-package that provides a qemu-system-<arch> package for native
 architectures where kvm can be enabled.
 
+%package virtiofs
+Summary: QEMU virtiofs daemon and tools
+Group: Development/Tools
+%description virtiofs
+This package provides a virtiofs daemon and command line tool
+
 
 %package  img
 Summary: QEMU command line tool for manipulating disk images
@@ -347,10 +353,13 @@ emulatedbuildarch="ppc64-softmmu s390x-softmmu sparc64-softmmu x86_64-softmmu mi
   --disable-strip --enable-pie --enable-numa --disable-werror --disable-xen --enable-curl --enable-jemalloc \
   --enable-glusterfs --enable-libiscsi --enable-virtfs --enable-rdma --enable-pvrdma --enable-replication --enable-libssh \
   --enable-tpm --enable-smartcard --enable-lzo --enable-bzip2 --enable-zstd --enable-libusb --enable-usb-redir --enable-libnfs \
-  --disable-gtk --disable-vte --disable-brlapi --enable-live-block-migration --enable-mpath --enable-membarrier \
+  --disable-gtk --disable-vte --disable-brlapi --enable-live-block-migration --enable-mpath --enable-membarrier --enable-libpmem \
   --enable-attr --enable-nettle --enable-vhost-scsi --enable-vhost-net --enable-vhost-vsock --enable-vhost-crypto --enable-crypto-afalg \
   --enable-xfsctl --enable-linux-aio --enable-vvfat --enable-coroutine-pool --enable-cap-ng --enable-opengl \
-  --enable-libpmem --enable-vhost-kernel --enable-debug-info \
+%ifarch x86_64
+  --enable-virglrenderer \
+%endif
+  --enable-vhost-kernel --enable-debug-info \
   --enable-curses --enable-vnc --enable-vnc-sasl --enable-vnc-jpeg --enable-vnc-png --enable-curl --enable-fdt \
   --audio-drv-list=pa,sdl,alsa,oss --enable-trace-backend=$tracebackends \
   --block-drv-rw-whitelist=qcow2,raw,file,host_device,nbd,iscsi,gluster,rdb,blkdebug,luks,null-co,https,ssh \
@@ -372,14 +381,14 @@ make DESTDIR=%{buildroot} install
   --disable-gtk --disable-vte --disable-brlapi --enable-live-block-migration --enable-mpath --enable-membarrier \
   --enable-attr --enable-nettle --enable-vhost-scsi --enable-vhost-net --enable-vhost-vsock --enable-vhost-crypto --enable-crypto-afalg \
   --enable-xfsctl --enable-linux-aio --enable-vvfat --enable-coroutine-pool --enable-cap-ng --enable-opengl \
-  --enable-libpmem --enable-vhost-kernel --enable-debug-info \
+  --enable-vhost-kernel --enable-debug-info \
   --enable-curses --enable-vnc --enable-vnc-sasl --enable-vnc-jpeg --enable-vnc-png --enable-curl --enable-fdt \
   --audio-drv-list=pa,sdl,alsa,oss --enable-trace-backend=$tracebackends \
   --block-drv-rw-whitelist=qcow2,raw,file,host_device,nbd,iscsi,gluster,rdb,blkdebug,luks,null-co,https,ssh \
   --block-drv-ro-whitelist=vmdk,vhdx,vpc \
   --extra-ldflags="$extraldflags -pie -Wl,-z,relro -Wl,-z,now" \
   --extra-cflags="$cflags -Wall" \
-  --target-list="$emulatedbuildarch" --enable-kvm --enable-tcg --enable-tcg-interpreter --enable-spice --enable-hax --enable-hvf \
+  --target-list="$emulatedbuildarch" --enable-kvm --enable-tcg --enable-tcg-interpreter --enable-spice --enable-hax \
   "$@"
 make V=1 %{?_smp_mflags} $buildldflags
 make DESTDIR=%{buildroot} install
@@ -640,6 +649,12 @@ getent passwd qemu >/dev/null || \
 %config(noreplace) %{_sysconfdir}/sysconfig/ksm
 
 
+%files virtiofs
+%{_bindir}/qemu-storage-daemon
+%{_libexecdir}/virtiofsd
+%{_datadir}/%{name}/vhost-user/50-qemu-virtiofsd.json
+
+
 %files guest-agent
 %doc COPYING
 %{_bindir}/qemu-ga
@@ -700,7 +715,7 @@ getent passwd qemu >/dev/null || \
 %{_datadir}/%{name}/palcode-clipper
 %{_datadir}/%{name}/bamboo.dtb
 %{_datadir}/%{name}/canyonlands.dtb
-%{_datadir}/%{name}/ppc_rom.bin
+#%{_datadir}/%{name}/ppc_rom.bin
 #%{_datadir}/%{name}/spapr-rtas.bin
 %{_datadir}/%{name}/u-boot.e500
 %{_datadir}/%{name}/efi-eepro100.rom
@@ -727,6 +742,7 @@ getent passwd qemu >/dev/null || \
 %{_datadir}/%{name}/firmware/60-edk2-arm.json
 %{_datadir}/%{name}/firmware/60-edk2-i386.json
 %{_datadir}/%{name}/firmware/60-edk2-x86_64.json
+%{_datadir}/%{name}/opensbi-riscv32-sifive_u-fw_jump.bin
 %{_datadir}/%{name}/opensbi-riscv32-virt-fw_jump.bin
 %{_datadir}/%{name}/opensbi-riscv64-sifive_u-fw_jump.bin
 %{_datadir}/%{name}/opensbi-riscv64-virt-fw_jump.bin