From 9d1981e775fe6f66f5113822376aea08a9a2a61d Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@centosproject.org>
Date: Sep 08 2022 15:02:10 +0000
Subject: Initial Hyperscale build


---

diff --git a/qemu.spec b/qemu.spec
index 7de9686..b9477ca 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -6,7 +6,9 @@
 %global libfdt_version 1.6.0
 %global libseccomp_version 2.4.0
 %global libusbx_version 1.0.23
-%global meson_version 0.58.2
+# HS(submitted-upstream): bump required meson version
+# https://src.fedoraproject.org/rpms/qemu/pull-request/27
+%global meson_version 0.59.3
 %global usbredir_version 0.7.1
 %global ipxe_version 20200823-5.git4bd064de
 
@@ -87,14 +89,14 @@
 %endif
 
 %global have_liburing 0
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos_hs}
 %ifnarch %{arm}
 %global have_liburing 1
 %endif
 %endif
 
 %global have_virgl 0
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos_hs}
 %global have_virgl 1
 %endif
 
@@ -140,16 +142,12 @@
 %endif
 
 %define have_block_nfs 0
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos_hs}
 %define have_block_nfs 1
 %endif
 
-%define have_capstone_devel 0
-%if 0%{?fedora}
-# capstone-devel is only on Fedora. Use it if it's available, but
-# if not, use the internal qemu submodule copy
+# HS(needs-upstreaming): unconditionally use capstone-devel
 %define have_capstone_devel 1
-%endif
 
 %define have_librdma 1
 %ifarch %{arm}
@@ -319,10 +317,13 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
 # To prevent rpmdev-bumpspec breakage
 %global baserelease 1
 
+# Hyperscale release
+%global hsrel .1
+
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 7.1.0
-Release: %{baserelease}%{?rcrel}%{?dist}
+Release: %{baserelease}%{?rcrel}%{?hsrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -341,9 +342,9 @@ Source31: kvm-x86.conf
 Source36: README.tests
 
 # Fix SGX assert
-Patch: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch
-Patch: 0001-tests-Disable-pci_virtio_vga-for-ppc64.patch
-Patch: 0010-Skip-iotests-entirely.patch
+Patch0: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch
+Patch1: 0001-tests-Disable-pci_virtio_vga-for-ppc64.patch
+Patch2: 0010-Skip-iotests-entirely.patch
 
 BuildRequires: meson >= %{meson_version}
 BuildRequires: zlib-devel
@@ -2750,6 +2751,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Thu Sep 08 2022 Davide Cavalca <dcavalca@centosproject.org> - 7.1.0-1.1
+- Bump required meson version
+- Unconditionally enable capstone-devel
+- Enable some additional features for Hyperscale
+- Number patches for compatibility with el8
+
 * Wed Aug 31 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.1.0-1
 - Rebase to qemu 7.1.0