* Tue Aug 27 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-5.el8

- kvm-redhat-s390x-Rename-s390-ccw-virtio-rhel8.0.0-to-s39.patch [bz#1693772]
- kvm-redhat-s390x-Add-proper-compatibility-options-for-th.patch [bz#1693772]
- kvm-enable-virgl.patch [bz#1559740]
- kvm-redhat-update-pseries-rhel8.1.0-machine-type.patch [bz#1744170]
- kvm-Do-not-run-iotests-on-brew-build.patch [bz#1742197 bz#1742819]
- Resolves: bz#1559740
  ([RFE] Enable virgl as TechPreview (qemu))
- Resolves: bz#1693772
  ([IBM zKVM] RHEL AV 8.1.0 machine type update for s390x)
- Resolves: bz#1742197
  (Remove iotests from qemu-kvm builds [RHEL AV 8.1.0])
- Resolves: bz#1742819
  (Remove iotests from qemu-kvm builds [RHEL 8.1.0])
- Resolves: bz#1744170
  ([IBM Power] New 8.1.0 machine type for pseries)
This commit is contained in:
Danilo C. L. de Paula 2019-08-27 20:51:16 +01:00
parent 9d9148b01f
commit 37b050692f
4 changed files with 228 additions and 7 deletions

View File

@ -0,0 +1,64 @@
From a9b22e8663f190e4a845815864e78ef61b68f2a4 Mon Sep 17 00:00:00 2001
From: Thomas Huth <thuth@redhat.com>
Date: Tue, 20 Aug 2019 09:24:41 +0100
Subject: [PATCH 2/5] redhat: s390x: Add proper compatibility options for the
-rhel7.6.0 machine
RH-Author: Thomas Huth <thuth@redhat.com>
Message-id: <20190820092441.28201-3-thuth@redhat.com>
Patchwork-id: 90078
O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH 2/2] redhat: s390x: Add proper compatibility options for the -rhel7.6.0 machine
Bugzilla: 1693772
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
RH-Acked-by: David Hildenbrand <david@redhat.com>
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Bugzilla: 1693772
Upstream: n/a (downstream only)
Since we skipped the -rhel8.0.0 machine on s390x, we have to add the
related compatibility properties now to the -rhel7.6.0 machine type
instead.
Also the "multiple epoch" facility was disabled on the z14GA1 CPU
in 7.6, so we also have to adjust our machine type here accordingly.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 2f4cd14..ebbde05 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -905,12 +905,25 @@ DEFINE_CCW_MACHINE(rhel810, "rhel8.1.0", true);
static void ccw_machine_rhel760_instance_options(MachineState *machine)
{
+ static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };
+
ccw_machine_rhel810_instance_options(machine);
+
+ s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
+
+ /* The multiple-epoch facility was not available with rhel7.6.0 on z14GA1 */
+ s390_cpudef_featoff(14, 1, S390_FEAT_MULTIPLE_EPOCH);
+ s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_QSIE);
+ s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_QTOUE);
+ s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_STOE);
+ s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_STOUE);
}
static void ccw_machine_rhel760_class_options(MachineClass *mc)
{
ccw_machine_rhel810_class_options(mc);
+ /* We never published the s390x version of RHEL8.0 AV, so add this here */
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len);
compat_props_add(mc->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len);
compat_props_add(mc->compat_props, ccw_compat_rhel_7_6, ccw_compat_rhel_7_6_len);
}
--
1.8.3.1

View File

@ -0,0 +1,64 @@
From fb192e5feac9ed77672e4acbfaec3bdad4d7684a Mon Sep 17 00:00:00 2001
From: Thomas Huth <thuth@redhat.com>
Date: Tue, 20 Aug 2019 09:24:40 +0100
Subject: [PATCH 1/5] redhat: s390x: Rename s390-ccw-virtio-rhel8.0.0 to
s390-ccw-virtio-rhel8.1.0
RH-Author: Thomas Huth <thuth@redhat.com>
Message-id: <20190820092441.28201-2-thuth@redhat.com>
Patchwork-id: 90077
O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH 1/2] redhat: s390x: Rename s390-ccw-virtio-rhel8.0.0 to s390-ccw-virtio-rhel8.1.0
Bugzilla: 1693772
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
RH-Acked-by: David Hildenbrand <david@redhat.com>
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Bugzilla: 1693772
Upstream: n/a
We did not ship RHEL AV 8.0 for s390x to customers, so we do not need
to maintain the s390-ccw-virtio-rhel8.0.0 machine. Rename it to
s390-ccw-virtio-rhel8.1.0 instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4d8c2ec..2f4cd14 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -894,23 +894,23 @@ GlobalProperty ccw_compat_rhel_7_5[] = {
};
const size_t ccw_compat_rhel_7_5_len = G_N_ELEMENTS(ccw_compat_rhel_7_5);
-static void ccw_machine_rhel800_instance_options(MachineState *machine)
+static void ccw_machine_rhel810_instance_options(MachineState *machine)
{
}
-static void ccw_machine_rhel800_class_options(MachineClass *mc)
+static void ccw_machine_rhel810_class_options(MachineClass *mc)
{
}
-DEFINE_CCW_MACHINE(rhel800, "rhel8.0.0", true);
+DEFINE_CCW_MACHINE(rhel810, "rhel8.1.0", true);
static void ccw_machine_rhel760_instance_options(MachineState *machine)
{
- ccw_machine_rhel800_instance_options(machine);
+ ccw_machine_rhel810_instance_options(machine);
}
static void ccw_machine_rhel760_class_options(MachineClass *mc)
{
- ccw_machine_rhel800_class_options(mc);
+ ccw_machine_rhel810_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len);
compat_props_add(mc->compat_props, ccw_compat_rhel_7_6, ccw_compat_rhel_7_6_len);
}
--
1.8.3.1

View File

@ -0,0 +1,73 @@
From bcba7281bbb2351fab69498c54fcda4e6154fa91 Mon Sep 17 00:00:00 2001
From: Laurent Vivier <lvivier@redhat.com>
Date: Fri, 23 Aug 2019 09:13:02 +0100
Subject: [PATCH 4/5] redhat: update pseries-rhel8.1.0 machine type
RH-Author: Laurent Vivier <lvivier@redhat.com>
Message-id: <20190823091302.8970-1-lvivier@redhat.com>
Patchwork-id: 90137
O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH] redhat: update pseries-rhel8.1.0 machine type
Bugzilla: 1744170
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
RH-Acked-by: David Gibson <dgibson@redhat.com>
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1744170
BRANCH: rhel-av-8.1.0/master-4.1.0
UPSTREAM: downstream only
BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=23160686
pseries-rhel8.1.0 has been created based on pseries-4.0,
we need to update it now we are based on pseries-4.1
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/ppc/spapr.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 669eae1..9b500d2 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4437,6 +4437,7 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
}
DEFINE_SPAPR_MACHINE(4_1, "4.1", true);
+#endif
/*
* pseries-4.0
@@ -4453,6 +4454,7 @@ static void phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
*nv2atsd = 0;
}
+#if 0 /* Disabled for Red Hat Enterprise Linux */
static void spapr_machine_4_0_class_options(MachineClass *mc)
{
SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
@@ -4796,7 +4798,7 @@ DEFINE_SPAPR_MACHINE(rhel810, "rhel8.1.0", true);
/*
* pseries-rhel8.0.0
- * like spapr_compat_3_1
+ * like pseries-3.1 and pseries-4.0
* except SPAPR_CAP_CFPC, SPAPR_CAP_SBBC and SPAPR_CAP_IBS
* that have been backported to pseries-rhel8.0.0
*/
@@ -4809,6 +4811,12 @@ static void spapr_machine_rhel800_class_options(MachineClass *mc)
compat_props_add(mc->compat_props, hw_compat_rhel_8_0,
hw_compat_rhel_8_0_len);
+ /* pseries-4.0 */
+ smc->phb_placement = phb_placement_4_0;
+ smc->irq = &spapr_irq_xics;
+ smc->pre_4_1_migration = true;
+
+ /* pseries-3.1 */
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
smc->update_dt_enabled = false;
smc->dr_phb_enabled = false;
--
1.8.3.1

View File

@ -67,7 +67,7 @@ Obsoletes: %1-rhev
Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm
Version: 4.1.0
Release: 4%{?dist}
Release: 5%{?dist}
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
Epoch: 15
License: GPLv2 and GPLv2+ and CC-BY
@ -136,6 +136,12 @@ Patch26: kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch
# For bz#1738626 - Disable memfd in QEMU
# For bz#1740797 - Disable memfd in QEMU
Patch27: kvm-RHEL-disable-hostmem-memfd.patch
# For bz#1693772 - [IBM zKVM] RHEL AV 8.1.0 machine type update for s390x
Patch28: kvm-redhat-s390x-Rename-s390-ccw-virtio-rhel8.0.0-to-s39.patch
# For bz#1693772 - [IBM zKVM] RHEL AV 8.1.0 machine type update for s390x
Patch29: kvm-redhat-s390x-Add-proper-compatibility-options-for-th.patch
# For bz#1744170 - [IBM Power] New 8.1.0 machine type for pseries
Patch31: kvm-redhat-update-pseries-rhel8.1.0-machine-type.patch
BuildRequires: wget
BuildRequires: rpm-build
@ -162,6 +168,7 @@ BuildRequires: python3-sphinx
BuildRequires: spice-protocol >= 0.12.12
BuildRequires: spice-server-devel >= 0.12.8
BuildRequires: libcacard-devel
BuildRequires: virglrenderer-devel
# For smartcard NSS support
BuildRequires: nss-devel
%endif
@ -475,9 +482,11 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
%if 0%{have_spice}
--enable-spice \
--enable-smartcard \
--enable-virglrenderer \
%else
--disable-spice \
--disable-smartcard \
--disable-virglrenderer \
%endif
%if 0%{have_opengl}
--enable-opengl \
@ -882,12 +891,6 @@ rm -rf $RPM_BUILD_ROOT%{qemudocdir}/specs
%check
export DIFF=diff; make check V=1
pushd tests/qemu-iotests
./check -v -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 045 048 052 063 077 086 101 104 106 120 132 140 143 145 147 150 152 157 159 160 162 170 171 175 181 184 194 208 218 221 222 226 227 232
./check -v -qcow2 001 002 003 004 005 007 008 009 010 011 012 017 018 019 020 021 022 024 025 027 028 029 031 032 033 034 035 036 037 038 039 042 043 046 047 048 049 050 052 053 054 056 057 058 062 063 065 066 069 072 073 074 080 085 086 087 089 090 091 095 096 097 098 102 103 104 105 107 108 110 111 114 117 120 126 127 130 132 133 134 137 138 140 141 142 143 144 145 147 150 151 152 156 157 158 159 162 165 170 174 177 179 181 184 187 188 189 190 191 194 195 196 198 201 202 203 204 206 208 209 214 216 217 218 222 226 227 232
./check -v -luks 001 002 003 004 005 008 009 010 011 012 021 032 033 052 140 143 145 157 162 174 181 184 208 218 227
./check -v -nbd 001 002 003 004 005 008 009 010 011 021 032 033 045 077 094 104 119 123 132 143 145 147 151 152 162 181 184 194 208 218 222
popd
%post -n qemu-kvm-core
# load kvm modules now, so we can make sure no reboot is needed.
@ -1077,6 +1080,23 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%changelog
* Tue Aug 27 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-5.el8
- kvm-redhat-s390x-Rename-s390-ccw-virtio-rhel8.0.0-to-s39.patch [bz#1693772]
- kvm-redhat-s390x-Add-proper-compatibility-options-for-th.patch [bz#1693772]
- kvm-enable-virgl.patch [bz#1559740]
- kvm-redhat-update-pseries-rhel8.1.0-machine-type.patch [bz#1744170]
- kvm-Do-not-run-iotests-on-brew-build.patch [bz#1742197 bz#1742819]
- Resolves: bz#1559740
([RFE] Enable virgl as TechPreview (qemu))
- Resolves: bz#1693772
([IBM zKVM] RHEL AV 8.1.0 machine type update for s390x)
- Resolves: bz#1742197
(Remove iotests from qemu-kvm builds [RHEL AV 8.1.0])
- Resolves: bz#1742819
(Remove iotests from qemu-kvm builds [RHEL 8.1.0])
- Resolves: bz#1744170
([IBM Power] New 8.1.0 machine type for pseries)
* Tue Aug 20 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-4.el8
- kvm-RHEL-disable-hostmem-memfd.patch [bz#1738626 bz#1740797]
- Resolves: bz#1738626