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

* Tue Dec 20 2022 Miroslav Rezanina <mrezanin@redhat.com> - 7.2.0-2

Browse Source 
- Fix updating from 7.1.0
- kvm-redhat-fix-virt-rhel9.2.0-compat-props.patch[bz#2154640]
- Resolves: bz#2154640
  ([aarch64] qemu fails to load "efi-virtio.rom" romfile when creating virtio-net-pci)
This commit is contained in:
Miroslav Rezanina 2022-12-20 07:02:54 +01:00
parent 9f4495a7b6
commit 896f01d9a3
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
kvm-redhat-fix-virt-rhel9.2.0-compat-props.patch Normal file
View File

@ -0,0 +1,43 @@
From 546e4213c4e8a7b2e369315a71bc9aec091eed6e Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cohuck@redhat.com>
Date: Mon, 19 Dec 2022 10:30:26 +0100
Subject: redhat: fix virt-rhel9.2.0 compat props
RH-Author: Cornelia Huck <cohuck@redhat.com>
RH-MergeRequest: 127: redhat: fix virt-rhel9.2.0 compat props
RH-Bugzilla: 2154640
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
RH-Acked-by: Gavin Shan <gshan@redhat.com>
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Commit: [1/1] 49635fdc1d9a934ece78abd160b07c19909f876a (cohuck/qemu-kvm-c9s)
We need to include arm_rhel_compat props in the latest machine.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/arm/virt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0a94f31dd1..bf18838b87 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3520,6 +3520,7 @@ type_init(rhel_machine_init);
static void rhel920_virt_options(MachineClass *mc)
{
+ compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
}
DEFINE_RHEL_MACHINE_AS_LATEST(9, 2, 0)
@@ -3529,7 +3530,6 @@ static void rhel900_virt_options(MachineClass *mc)
rhel920_virt_options(mc);
- compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
compat_props_add(mc->compat_props, hw_compat_rhel_9_1, hw_compat_rhel_9_1_len);
/* Disable FEAT_LPA2 since old kernels (<= v5.12) don't boot with that feature */
--
2.38.1

17
qemu-kvm.spec
View File

@ -148,7 +148,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version} \
Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm
Version: 7.2.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)
@ -191,6 +191,7 @@ Patch0019: 0019-redhat-Update-s390x-machine-type-compatibility-for-Q.patch
Patch0020: 0020-redhat-aarch64-add-rhel9.2.0-virt-machine-type.patch
Patch0021: 0021-redhat-Add-new-rhel-9.2.0-s390x-machine-type.patch
Patch0022: 0022-x86-rhel-9.2.0-machine-type.patch
Patch23: kvm-redhat-fix-virt-rhel9.2.0-compat-props.patch
%if %{have_clang}
BuildRequires: clang
@ -327,6 +328,10 @@ Requires: seabios-bin >= 1.10.2-1
Requires: seavgabios-bin >= 1.12.0-3
Requires: ipxe-roms-qemu >= %{ipxe_version}
%endif
# Removal -gl modules as they do not provide any functionality - see bz#2149022
Obsoletes: %{name}-device-display-virtio-gpu-gl <= %{epoch}:%{version}
Obsoletes: %{name}-device-display-virtio-gpu-pci-gl <= %{epoch}:%{version}
Obsoletes: %{name}-device-display-virtio-vga-gl <= %{epoch}:%{version}
%description common
%{name} is an open source virtualizer that provides hardware emulation for
@ -494,6 +499,10 @@ mkdir -p %{qemu_kvm_build}
%build
# Necessary hack for ZUUL CI
ulimit -n 10240
%define disable_everything \\\
--audio-drv-list= \\\
--disable-alsa \\\
@ -1211,6 +1220,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%endif
%changelog
* Tue Dec 20 2022 Miroslav Rezanina <mrezanin@redhat.com> - 7.2.0-2
- Fix updating from 7.1.0
- kvm-redhat-fix-virt-rhel9.2.0-compat-props.patch[bz#2154640]
- Resolves: bz#2154640
([aarch64] qemu fails to load "efi-virtio.rom" romfile when creating virtio-net-pci)
* Thu Dec 15 2022 Miroslav Rezanina <mrezanin@redhat.com> - 7.2.0-1
- Rebase to QEMU 7.2.0 [bz#2135806]
- Resolves: bz#2135806