* Tue Oct 05 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.1.0-4
- kvm-redhat-Define-hw_compat_rhel_8_5.patch [bz#1998943] - kvm-redhat-Add-s390x-machine-type-compatibility-update-f.patch [bz#1998943] - Resolves: bz#1998943 (Add machine type compatibility update for 6.1 rebase [s390x])
This commit is contained in:
Miroslav Rezanina
parent
2d3f868ca9
commit
21b6f1766a
@ -0,0 +1,45 @@
|
||||
From 9b72a86292fb2c34d7be7b928ac06f2609de0f43 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Huth <thuth@redhat.com>
|
||||
Date: Thu, 30 Sep 2021 09:25:23 +0200
|
||||
Subject: [PATCH 2/2] redhat: Add s390x machine type compatibility update for
|
||||
6.1 rebase
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||
RH-MergeRequest: 45: Add s390x machine type compatibility update for 6.1 rebase
|
||||
RH-Commit: [2/2] 6f71801ac2d77b82b010eac46cd82cd74c53f246 (thuth/qemu-kvm-cs9)
|
||||
RH-Bugzilla: 1998943
|
||||
RH-Acked-by: Greg Kurz <gkurz@redhat.com>
|
||||
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||||
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||||
|
||||
Add hw_compat_rhel_8_5 for the s390-ccw-virtio-rhel8.5.0 machine
|
||||
type. It's currently not urgently required, since hw_compat_rhel_8_5
|
||||
only contains entries that are not related to s390x, but just in
|
||||
case some other entries are added there later, it's better if we
|
||||
add this right from the start to the s390x machine, too.
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1998943
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
---
|
||||
hw/s390x/s390-virtio-ccw.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
||||
index 9a51dd8de2..4ee8d266ec 100644
|
||||
--- a/hw/s390x/s390-virtio-ccw.c
|
||||
+++ b/hw/s390x/s390-virtio-ccw.c
|
||||
@@ -1091,6 +1091,7 @@ static void ccw_machine_rhel850_instance_options(MachineState *machine)
|
||||
|
||||
static void ccw_machine_rhel850_class_options(MachineClass *mc)
|
||||
{
|
||||
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
|
||||
}
|
||||
DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", true);
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
74
kvm-redhat-Define-hw_compat_rhel_8_5.patch
Normal file
74
kvm-redhat-Define-hw_compat_rhel_8_5.patch
Normal file
@ -0,0 +1,74 @@
|
||||
From 1f0a5d3ae9c835e35b83cf8bbedd0f814df3451d Mon Sep 17 00:00:00 2001
|
||||
From: Greg Kurz <gkurz@redhat.com>
|
||||
Date: Mon, 27 Sep 2021 10:02:46 +0200
|
||||
Subject: [PATCH 1/2] redhat: Define hw_compat_rhel_8_5
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||
RH-MergeRequest: 45: Add s390x machine type compatibility update for 6.1 rebase
|
||||
RH-Commit: [1/2] 5d304edf2bee7abc57843deb9e5d85ab5f19a34c (thuth/qemu-kvm-cs9)
|
||||
RH-Bugzilla: 1998943
|
||||
RH-Acked-by: Greg Kurz <gkurz@redhat.com>
|
||||
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||||
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||||
|
||||
The QEMU 6.1 rebase changed the default value of some properties
|
||||
for existing machine types. Prepare ground by introducing
|
||||
hw_compat_rhel_8_5.
|
||||
|
||||
Signed-off-by: Greg Kurz <gkurz@redhat.com>
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1998943
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
---
|
||||
hw/core/machine.c | 17 +++++++++++++++++
|
||||
include/hw/boards.h | 3 +++
|
||||
2 files changed, 20 insertions(+)
|
||||
|
||||
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
||||
index d681a06a47..a14503cc30 100644
|
||||
--- a/hw/core/machine.c
|
||||
+++ b/hw/core/machine.c
|
||||
@@ -37,6 +37,23 @@
|
||||
#include "hw/virtio/virtio.h"
|
||||
#include "hw/virtio/virtio-pci.h"
|
||||
|
||||
+/*
|
||||
+ * Mostly the same as hw_compat_6_0
|
||||
+ */
|
||||
+GlobalProperty hw_compat_rhel_8_5[] = {
|
||||
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
||||
+ { "gpex-pcihost", "allow-unmapped-accesses", "false" },
|
||||
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
||||
+ { "i8042", "extended-state", "false"},
|
||||
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
||||
+ { "nvme-ns", "eui64-default", "off"},
|
||||
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
||||
+ { "e1000", "init-vet", "off" },
|
||||
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
||||
+ { "e1000e", "init-vet", "off" },
|
||||
+};
|
||||
+const size_t hw_compat_rhel_8_5_len = G_N_ELEMENTS(hw_compat_rhel_8_5);
|
||||
+
|
||||
/*
|
||||
* Mostly the same as hw_compat_5_2
|
||||
*/
|
||||
diff --git a/include/hw/boards.h b/include/hw/boards.h
|
||||
index a2b1681027..7b9208ef7a 100644
|
||||
--- a/include/hw/boards.h
|
||||
+++ b/include/hw/boards.h
|
||||
@@ -418,6 +418,9 @@ extern const size_t hw_compat_2_2_len;
|
||||
extern GlobalProperty hw_compat_2_1[];
|
||||
extern const size_t hw_compat_2_1_len;
|
||||
|
||||
+extern GlobalProperty hw_compat_rhel_8_5[];
|
||||
+extern const size_t hw_compat_rhel_8_5_len;
|
||||
+
|
||||
extern GlobalProperty hw_compat_rhel_8_4[];
|
||||
extern const size_t hw_compat_rhel_8_4_len;
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -135,7 +135,7 @@ Obsoletes: %{name}-block-iscsi <= %{version} \
|
||||
Summary: QEMU is a machine emulator and virtualizer
|
||||
Name: qemu-kvm
|
||||
Version: 6.1.0
|
||||
Release: 3%{?rcrel}%{?dist}%{?cc_suffix}
|
||||
Release: 4%{?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)
|
||||
@ -188,6 +188,10 @@ Patch19: kvm-hw-arm-virt-Remove-9.0-machine-type.patch
|
||||
Patch20: kvm-disable-sga-device.patch
|
||||
# For bz#2005026 - [s390][virtio-fs] Umount virtiofs shared folder failure from guest side [rhel-9.0.0]
|
||||
Patch21: kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch
|
||||
# For bz#1998943 - Add machine type compatibility update for 6.1 rebase [s390x]
|
||||
Patch22: kvm-redhat-Define-hw_compat_rhel_8_5.patch
|
||||
# For bz#1998943 - Add machine type compatibility update for 6.1 rebase [s390x]
|
||||
Patch23: kvm-redhat-Add-s390x-machine-type-compatibility-update-f.patch
|
||||
|
||||
# Source-git patches
|
||||
|
||||
@ -1179,6 +1183,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 05 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.1.0-4
|
||||
- kvm-redhat-Define-hw_compat_rhel_8_5.patch [bz#1998943]
|
||||
- kvm-redhat-Add-s390x-machine-type-compatibility-update-f.patch [bz#1998943]
|
||||
- Resolves: bz#1998943
|
||||
(Add machine type compatibility update for 6.1 rebase [s390x])
|
||||
|
||||
* Fri Sep 24 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.1.0-3
|
||||
- kvm-disable-sga-device.patch [bz#2000845]
|
||||
- kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch [bz#2005026]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user