* Fri May 06 2022 Miroslav Rezanina <mrezanin@redhat.com> - 7.0.0-2

- kvm-configs-devices-aarch64-softmmu-Enable-CONFIG_VIRTIO.patch [bz#2044162]
- kvm-target-ppc-cpu-models-Fix-ppc_cpu_aliases-list-for-R.patch [bz#2081022]
- Resolves: bz#2044162
  ([RHEL9.1] Enable virtio-mem as tech-preview on ARM64 QEMU)
- Resolves: bz#2081022
  (Build regression on ppc64le with c9s qemu-kvm 7.0.0-1 changes)

kvm-configs-devices-aarch64-softmmu-Enable-CONFIG_VIRTIO.patch

@@ -0,0 +1,41 @@
+From 3a0e9bb88e82cc76ca5efc0595ce94b5dc34749e Mon Sep 17 00:00:00 2001
+From: Gavin Shan <gshan@redhat.com>
+Date: Mon, 25 Apr 2022 13:42:46 +0800
+Subject: [PATCH 1/2] configs/devices/aarch64-softmmu: Enable CONFIG_VIRTIO_MEM
+
+RH-Author: Gavin Shan <gshan@redhat.com>
+RH-MergeRequest: 80: Enable virtio-mem for aarch64
+RH-Commit: [1/1] 1afbd08da6d7c860da8d617a0a932d3660514878 (gwshan/qemu-rhel-9)
+RH-Bugzilla: 2044162
+RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
+RH-Acked-by: Eric Auger <eric.auger@redhat.com>
+RH-Acked-by: David Hildenbrand <david@redhat.com>
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2044162
+
+This enables virtio-mem device on aarch64 since all needed commits
+are ready.
+
+    b1b87327a9 hw/arm/virt: Support for virtio-mem-pci
+    1263615efe virtio-mem: Correct default THP size for ARM64
+
+Signed-off-by: Gavin Shan <gshan@redhat.com>
+---
+ configs/devices/aarch64-softmmu/aarch64-rh-devices.mak | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak b/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak
+index 5f6ee1de5b..187938573f 100644
+--- a/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak
++++ b/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak
+@@ -22,6 +22,7 @@ CONFIG_VFIO=y
+ CONFIG_VFIO_PCI=y
+ CONFIG_VIRTIO_MMIO=y
+ CONFIG_VIRTIO_PCI=y
++CONFIG_VIRTIO_MEM=y
+ CONFIG_XIO3130=y
+ CONFIG_NVDIMM=y
+ CONFIG_ACPI_APEI=y
+-- 
+2.35.1
+

kvm-target-ppc-cpu-models-Fix-ppc_cpu_aliases-list-for-R.patch

@@ -0,0 +1,48 @@
+From 39642d0d37e2ef61ce7fde0bc284d37a365e4482 Mon Sep 17 00:00:00 2001
+From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
+Date: Mon, 2 May 2022 17:59:11 -0300
+Subject: [PATCH 2/2] target/ppc/cpu-models: Fix ppc_cpu_aliases list for RHEL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RH-Author: Murilo Opsfelder Araújo <muriloo@linux.ibm.com>
+RH-MergeRequest: 81: target/ppc/cpu-models: remove extraneous "#endif"
+RH-Commit: [1/1] 5fff003ad3deb84c6a8e69ab90552a31edb3b058 (mopsfelder/centos-stream-src-qemu-kvm)
+RH-Bugzilla: 2081022
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Acked-by: Thomas Huth <thuth@redhat.com>
+RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
+
+The commit b9d28ecdedaf ("Enable/disable devices for RHEL") removed the
+"#if 0" from the beginning of the ppc_cpu_aliases list, which broke the
+build on ppc64le:
+
+    ../target/ppc/cpu-models.c:904:2: error: #endif without #if
+    #endif
+     ^
+    1 error generated.
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2081022
+
+Fixes: b9d28ecdedaf (Enable/disable devices for RHEL)
+Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
+---
+ target/ppc/cpu-models.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
+index dd78883410..528467eac1 100644
+--- a/target/ppc/cpu-models.c
++++ b/target/ppc/cpu-models.c
+@@ -746,6 +746,7 @@
+ /* PowerPC CPU aliases                                                     */
+ 
+ PowerPCCPUAlias ppc_cpu_aliases[] = {
++#if 0  /* Disabled for Red Hat Enterprise Linux */
+     { "405", "405d4" },
+     { "405cr", "405crc" },
+     { "405gp", "405gpd" },
+-- 
+2.35.1
+

qemu-kvm.spec

@@ -151,7 +151,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version}                    \
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 7.0.0
-Release: 1%{?rcrel}%{?dist}%{?cc_suffix}
+Release: 2%{?rcrel}%{?dist}%{?cc_suffix}
 # 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)
@@ -194,6 +194,10 @@ Patch0018: 0018-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch
 Patch0019: 0019-WRB-Introduce-RHEL-9.0.0-hw-compat-structure.patch
 Patch0020: 0020-redhat-Update-s390x-machine-type-compatibility-for-r.patch
 Patch0021: 0021-pc-Move-s3-s4-suspend-disabling-to-compat.patch
+# For bz#2044162 - [RHEL9.1] Enable virtio-mem as tech-preview on ARM64 QEMU
+Patch22: kvm-configs-devices-aarch64-softmmu-Enable-CONFIG_VIRTIO.patch
+# For bz#2081022 - Build regression on ppc64le with c9s qemu-kvm 7.0.0-1 changes
+Patch23: kvm-target-ppc-cpu-models-Fix-ppc_cpu_aliases-list-for-R.patch
 
 # Source-git patches
 
@@ -1229,6 +1233,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %endif
 
 %changelog
+* Fri May 06 2022 Miroslav Rezanina <mrezanin@redhat.com> - 7.0.0-2
+- kvm-configs-devices-aarch64-softmmu-Enable-CONFIG_VIRTIO.patch [bz#2044162]
+- kvm-target-ppc-cpu-models-Fix-ppc_cpu_aliases-list-for-R.patch [bz#2081022]
+- Resolves: bz#2044162
+  ([RHEL9.1] Enable virtio-mem as tech-preview on ARM64 QEMU)
+- Resolves: bz#2081022
+  (Build regression on ppc64le with c9s qemu-kvm 7.0.0-1 changes)
+
 * Wed Apr 20 2022 Miroslav Rezanina <mrezanin@redhat.com> - 7.0.0-1
 - Rebase to QEMU 7.0.0 [bz#2064757]
 - Do not build ssh block driver anymore [bz#2064500]