From 013897ee56e02701dd56ecf11a3efdc343cd1c7c Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 25 May 2021 09:43:37 +0200 Subject: [PATCH] * Tue May 25 2021 Miroslav Reznaina - 6.0.0-3 - kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch [bz#1944730] - Resolves: bz#1944730 (Remove RHEL7 machine type (s390-ccw-virtio-rhel7.5.0)) --- ...x-Remove-the-RHEL7-only-machine-type.patch | 67 +++++++++++++++++++ qemu-kvm.spec | 9 ++- rpminspect.yaml | 2 +- 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch diff --git a/kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch b/kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch new file mode 100644 index 0000000..cf4e6bb --- /dev/null +++ b/kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch @@ -0,0 +1,67 @@ +From 64a9a5c971c424ff2d8074f52d48dd6233dc97ac Mon Sep 17 00:00:00 2001 +From: Thomas Huth +Date: Tue, 18 May 2021 18:27:54 +0200 +Subject: [PATCH] hw/s390x: Remove the RHEL7-only machine type + +RH-Author: Thomas Huth +RH-MergeRequest: 7: hw/s390x: Remove the RHEL7-only machine type +RH-Commit: [1/1] 8c53d4ae81 (thuth/qemu-kvm) +RH-Bugzilla: 1944730 +RH-Acked-by: Miroslav Rezanina +RH-Acked-by: Cornelia Huck +RH-Acked-by: David Hildenbrand + +We only support live migration from RHEL8 in RHEL9, so we can remove +the RHEL7 machine type "s390-ccw-virtio-rhel7.5.0". + +Signed-off-by: Thomas Huth +--- + hw/s390x/s390-virtio-ccw.c | 32 -------------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c +index 8df6dd1c71..432f36bce5 100644 +--- a/hw/s390x/s390-virtio-ccw.c ++++ b/hw/s390x/s390-virtio-ccw.c +@@ -1125,38 +1125,6 @@ static void ccw_machine_rhel760_class_options(MachineClass *mc) + } + DEFINE_CCW_MACHINE(rhel760, "rhel7.6.0", false); + +-static void ccw_machine_rhel750_instance_options(MachineState *machine) +-{ +- static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_11 }; +- ccw_machine_rhel760_instance_options(machine); +- +- /* before 2.12 we emulated the very first z900, and RHEL 7.5 is +- based on 2.10 */ +- s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat); +- +- /* bpb and ppa15 were only in the full model in RHEL 7.5 */ +- s390_cpudef_featoff_greater(11, 1, S390_FEAT_PPA15); +- s390_cpudef_featoff_greater(11, 1, S390_FEAT_BPB); +-} +- +-GlobalProperty ccw_compat_rhel_7_5[] = { +- { +- .driver = TYPE_SCLP_EVENT_FACILITY, +- .property = "allow_all_mask_sizes", +- .value = "off", +- }, +-}; +-const size_t ccw_compat_rhel_7_5_len = G_N_ELEMENTS(ccw_compat_rhel_7_5); +- +-static void ccw_machine_rhel750_class_options(MachineClass *mc) +-{ +- ccw_machine_rhel760_class_options(mc); +- compat_props_add(mc->compat_props, hw_compat_rhel_7_5, hw_compat_rhel_7_5_len); +- compat_props_add(mc->compat_props, ccw_compat_rhel_7_5, ccw_compat_rhel_7_5_len); +- S390_CCW_MACHINE_CLASS(mc)->hpage_1m_allowed = false; +-} +-DEFINE_CCW_MACHINE(rhel750, "rhel7.5.0", false); +- + static void ccw_machine_register_types(void) + { + type_register_static(&ccw_machine_info); +-- +2.27.0 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 3f01cf8..2a6e82a 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -65,7 +65,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 6.0.0 -Release: 2%{?rcversion}%{?dist} +Release: 3%{?rcversion}%{?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 @@ -117,6 +117,8 @@ Patch0017: 0017-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch Patch0018: 0018-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch # For bz#1906168 - [RHEL-9] qemu-kvm spec-file: Do not BuildRequire spice Patch19: kvm-Remove-SPICE-and-QXL-from-x86_64-rh-devices.mak.patch +# For bz#1944730 - Remove RHEL7 machine type (s390-ccw-virtio-rhel7.5.0) +Patch20: kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch BuildRequires: wget BuildRequires: rpm-build @@ -1223,6 +1225,11 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || : %endif %changelog +* Tue May 25 2021 Miroslav Reznaina - 6.0.0-3 +- kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch [bz#1944730] +- Resolves: bz#1944730 + (Remove RHEL7 machine type (s390-ccw-virtio-rhel7.5.0)) + * Thu May 13 2021 Miroslav Rezanina - 6.0.0-2 - kvm-Remove-message-with-running-VM-count.patch [bz#1914461] - kvm-Remove-SPICE-and-QXL-from-x86_64-rh-devices.mak.patch [bz#1906168] diff --git a/rpminspect.yaml b/rpminspect.yaml index 51de3b4..53ce59a 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -1,6 +1,6 @@ --- elf: - exclude_path:(.*s390-ccw.img.*)|(.*s390-netboot.img.*) + exclude_path: (.*s390-ccw.img.*)|(.*s390-netboot.img.*) inspections: badfuncs: off