* Fri Jan 07 2022 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-2
- kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch [bz#2008060] - kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch [bz#2014484] - Resolves: bz#2008060 (Fix CPU Model for new IBM Z Hardware - qemu part) - Resolves: bz#2014484 ([RHEL9] Enable virtio-mem as tech-preview on x86-64 - QEMU)
This commit is contained in:
Miroslav Rezanina
parent
037e637fa3
commit
34dbcea312
@ -0,0 +1,82 @@
|
||||
From 0e85c10b73c36f386723c842a797d5e2155e758f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Huth <thuth@redhat.com>
|
||||
Date: Fri, 10 Dec 2021 10:07:40 +0100
|
||||
Subject: [PATCH 1/2] redhat: Add rhel8.6.0 and rhel9.0.0 machine types for
|
||||
s390x
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||
RH-MergeRequest: 55: redhat: Add rhel8.6.0 and rhel9.0.0 machine types for s390x
|
||||
RH-Commit: [1/1] ad8fd5c825ae52a8fbb3a28f700a514509c59978 (thuth/qemu-kvm-cs9)
|
||||
RH-Bugzilla: 2008060
|
||||
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
||||
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||||
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2008060
|
||||
|
||||
The new machine types have better default values for the upcoming
|
||||
"generation 16" mainframe.
|
||||
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
---
|
||||
hw/s390x/s390-virtio-ccw.c | 26 +++++++++++++++++++++++++-
|
||||
1 file changed, 25 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
||||
index c654045964..9da6e9b1d4 100644
|
||||
--- a/hw/s390x/s390-virtio-ccw.c
|
||||
+++ b/hw/s390x/s390-virtio-ccw.c
|
||||
@@ -1103,10 +1103,33 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
|
||||
DEFINE_CCW_MACHINE(2_4, "2.4", false);
|
||||
#endif
|
||||
|
||||
+static void ccw_machine_rhel900_instance_options(MachineState *machine)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+static void ccw_machine_rhel900_class_options(MachineClass *mc)
|
||||
+{
|
||||
+}
|
||||
+DEFINE_CCW_MACHINE(rhel900, "rhel9.0.0", true);
|
||||
+
|
||||
+static void ccw_machine_rhel860_instance_options(MachineState *machine)
|
||||
+{
|
||||
+ /* Note: The -rhel8.6.0 and -rhel9.0.0 machines are technically identical */
|
||||
+ ccw_machine_rhel900_instance_options(machine);
|
||||
+}
|
||||
+
|
||||
+static void ccw_machine_rhel860_class_options(MachineClass *mc)
|
||||
+{
|
||||
+ ccw_machine_rhel900_class_options(mc);
|
||||
+}
|
||||
+DEFINE_CCW_MACHINE(rhel860, "rhel8.6.0", false);
|
||||
+
|
||||
static void ccw_machine_rhel850_instance_options(MachineState *machine)
|
||||
{
|
||||
static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_0 };
|
||||
|
||||
+ ccw_machine_rhel860_instance_options(machine);
|
||||
+
|
||||
s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat);
|
||||
|
||||
s390_cpudef_featoff_greater(16, 1, S390_FEAT_NNPA);
|
||||
@@ -1118,10 +1141,11 @@ static void ccw_machine_rhel850_instance_options(MachineState *machine)
|
||||
|
||||
static void ccw_machine_rhel850_class_options(MachineClass *mc)
|
||||
{
|
||||
+ ccw_machine_rhel860_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
|
||||
mc->smp_props.prefer_sockets = true;
|
||||
}
|
||||
-DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", true);
|
||||
+DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", false);
|
||||
|
||||
static void ccw_machine_rhel840_instance_options(MachineState *machine)
|
||||
{
|
||||
--
|
||||
2.27.0
|
||||
|
||||
43
kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch
Normal file
43
kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From 24b44713de4b2a47c42dfeea813c8911694367a0 Mon Sep 17 00:00:00 2001
|
||||
From: David Hildenbrand <david@redhat.com>
|
||||
Date: Fri, 17 Dec 2021 10:00:53 +0100
|
||||
Subject: [PATCH 2/2] redhat: Enable virtio-mem as tech-preview on x86-64
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
RH-Author: David Hildenbrand <david@redhat.com>
|
||||
RH-MergeRequest: 56: redhat: Enable virtio-mem as tech-preview on x86-64
|
||||
RH-Commit: [1/1] 255749cd877b91ce1978b67a088f7c0e181fd85e
|
||||
RH-Bugzilla: 2014484
|
||||
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||||
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2014484
|
||||
Upstream-status: RHEL-only
|
||||
|
||||
Everything necesssary for tech-preview of virtio-mem in RHEL9 is
|
||||
included in QEMU v6.2. Let's enable it via the config option
|
||||
CONFIG_VIRTIO_MEM on x86-64.
|
||||
|
||||
Signed-off-by: David Hildenbrand <david@redhat.com>
|
||||
---
|
||||
configs/devices/x86_64-softmmu/x86_64-rh-devices.mak | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
|
||||
index 1f7a9ab024..dc03fbb671 100644
|
||||
--- a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
|
||||
+++ b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
|
||||
@@ -88,6 +88,7 @@ CONFIG_VGA_CIRRUS=y
|
||||
CONFIG_VGA_PCI=y
|
||||
CONFIG_VHOST_USER=y
|
||||
CONFIG_VHOST_USER_BLK=y
|
||||
+CONFIG_VIRTIO_MEM=y
|
||||
CONFIG_VIRTIO_PCI=y
|
||||
CONFIG_VIRTIO_VGA=y
|
||||
CONFIG_VMMOUSE=y
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -130,7 +130,7 @@ Obsoletes: %{name}-block-iscsi <= %{version} \
|
||||
Summary: QEMU is a machine emulator and virtualizer
|
||||
Name: qemu-kvm
|
||||
Version: 6.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)
|
||||
@ -177,6 +177,10 @@ Patch0022: 0022-x86-rhel-machine-types-Wire-compat-into-q35-and-i440.patch
|
||||
Patch0023: 0023-redhat-virt-rhel8.5.0-Update-machine-type-compatibil.patch
|
||||
Patch0024: 0024-redhat-Add-s390x-machine-type-compatibility-handling.patch
|
||||
Patch0025: 0025-compat-Update-hw_compat_rhel_8_5-with-6.2.0-RC2-chan.patch
|
||||
# For bz#2008060 - Fix CPU Model for new IBM Z Hardware - qemu part
|
||||
Patch26: kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch
|
||||
# For bz#2014484 - [RHEL9] Enable virtio-mem as tech-preview on x86-64 - QEMU
|
||||
Patch27: kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch
|
||||
|
||||
%if %{have_clang}
|
||||
BuildRequires: clang
|
||||
@ -1155,6 +1159,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jan 07 2022 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-2
|
||||
- kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch [bz#2008060]
|
||||
- kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch [bz#2014484]
|
||||
- Resolves: bz#2008060
|
||||
(Fix CPU Model for new IBM Z Hardware - qemu part)
|
||||
- Resolves: bz#2014484
|
||||
([RHEL9] Enable virtio-mem as tech-preview on x86-64 - QEMU)
|
||||
|
||||
* Thu Dec 16 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-1
|
||||
- Rebase to QEMU 6.2.0 [bz#2027697]
|
||||
- Resolves: bz#2027697
|
||||
|
||||
Loading…
Reference in New Issue
Block a user