rpms/qemu-kvm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Oct 18 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.1.0-6

Browse Source 
- kvm-hw-arm-virt-Add-hw_compat_rhel_8_5-to-8.5-machine-ty.patch [bz#1998942]
- Resolves: bz#1998942
  (Add machine type compatibility update for 6.1 rebase [aarch64])
This commit is contained in:
Miroslav Rezanina 2021-10-18 07:42:35 -04:00
parent d9e6577b11
commit 17e28947d4
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kvm-hw-arm-virt-Add-hw_compat_rhel_8_5-to-8.5-machine-ty.patch Normal file
View File

@ -0,0 +1,38 @@
From c0fa5e8ad618a980752f7053de4d4fedd46b5b53 Mon Sep 17 00:00:00 2001
From: Eric Auger <eric.auger@redhat.com>
Date: Tue, 12 Oct 2021 17:53:07 +0200
Subject: [PATCH] hw: arm: virt: Add hw_compat_rhel_8_5 to 8.5 machine type
RH-Author: Eric Auger <eric.auger@redhat.com>
RH-MergeRequest: 48: hw: arm: virt: Add hw_compat_rhel_8_5 to 8.5 machine type
RH-Commit: [1/1] f4230d3bbd94beb44afb23cb0d1561ff2bc71340 (eauger1/centos-qemu-kvm)
RH-Bugzilla: 1998942
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Acked-by: Gavin Shan <gshan@redhat.com>
RH-Acked-by: Andrew Jones <drjones@redhat.com>
branch: c9s
Upstream: no
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=40295089
Add hw_compat_rhel_8_5 to rhel8.5 virt options.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/arm/virt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 9e7cb687dc..79286c40ec 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3148,5 +3148,6 @@ type_init(rhel_machine_init);
static void rhel850_virt_options(MachineClass *mc)
{
compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
}
DEFINE_RHEL_MACHINE_AS_LATEST(8, 5, 0)
--
2.27.0

9
qemu-kvm.spec
View File

@ -133,7 +133,7 @@ Obsoletes: %{name}-block-iscsi <= %{version} \
Summary: QEMU is a machine emulator and virtualizer Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm Name: qemu-kvm
Version: 6.1.0 Version: 6.1.0
Release: 5%{?rcrel}%{?dist}%{?cc_suffix} Release: 6%{?rcrel}%{?dist}%{?cc_suffix}
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
# Epoch 15 used for RHEL 8 # Epoch 15 used for RHEL 8
# Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5) # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5)
@ -192,6 +192,8 @@ Patch22: kvm-redhat-Define-hw_compat_rhel_8_5.patch
Patch23: kvm-redhat-Add-s390x-machine-type-compatibility-update-f.patch Patch23: kvm-redhat-Add-s390x-machine-type-compatibility-update-f.patch
# For bz#1984401 - fails to revert snapshot of a VM [balloon/page-poison] # For bz#1984401 - fails to revert snapshot of a VM [balloon/page-poison]
Patch24: kvm-virtio-balloon-Fix-page-poison-subsection-name.patch Patch24: kvm-virtio-balloon-Fix-page-poison-subsection-name.patch
# For bz#1998942 - Add machine type compatibility update for 6.1 rebase [aarch64]
Patch25: kvm-hw-arm-virt-Add-hw_compat_rhel_8_5-to-8.5-machine-ty.patch
# Source-git patches # Source-git patches
@ -1183,6 +1185,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%endif %endif
%changelog %changelog
* Mon Oct 18 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.1.0-6
- kvm-hw-arm-virt-Add-hw_compat_rhel_8_5-to-8.5-machine-ty.patch [bz#1998942]
- Resolves: bz#1998942
(Add machine type compatibility update for 6.1 rebase [aarch64])
* Mon Oct 11 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.1.0-5 * Mon Oct 11 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.1.0-5
- kvm-virtio-balloon-Fix-page-poison-subsection-name.patch [bz#1984401] - kvm-virtio-balloon-Fix-page-poison-subsection-name.patch [bz#1984401]
- kvm-spec-Remove-block-curl-and-block-ssh-dependency.patch [bz#2010985] - kvm-spec-Remove-block-curl-and-block-ssh-dependency.patch [bz#2010985]