Enable building for ppc64le

Don't remove slof.bin for ppc64le

usb: add config options for hub and hid devices for ppc
This commit is contained in:
Eduard Abdullin 2025-05-07 14:09:24 +00:00 committed by root
commit ae764dce25
4 changed files with 108 additions and 2 deletions

View File

@ -0,0 +1,24 @@
From 3fba57ee91df62b5efa82ee0e066a5a2efc1da04 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Wed, 9 Apr 2025 16:43:18 +0300
Subject: [PATCH] Bring back missing line in target/ppc/cpu-models.c
---
target/ppc/cpu-models.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index f77ebfcc8..18e942200 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -744,6 +744,7 @@
/* PowerPC CPU aliases */
PowerPCCPUAlias ppc_cpu_aliases[] = {
+#if 0 /* Disabled for Red Hat Enterprise Linux */
{ "405", "405d4" },
{ "405cr", "405crc" },
{ "405gp", "405gpd" },
--
2.39.5 (Apple Git-154)

View File

@ -0,0 +1,25 @@
From 142dc9a4a974867563c751663bbeec5e9b675522 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 10 Apr 2025 13:16:31 +0300
Subject: [PATCH] usb: add config options for hub and hid devices for ppc
---
configs/devices/ppc64-softmmu/ppc64-rh-devices.mak | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/devices/ppc64-softmmu/ppc64-rh-devices.mak b/configs/devices/ppc64-softmmu/ppc64-rh-devices.mak
index dbb7d3082..4b801b126 100644
--- a/configs/devices/ppc64-softmmu/ppc64-rh-devices.mak
+++ b/configs/devices/ppc64-softmmu/ppc64-rh-devices.mak
@@ -20,6 +20,8 @@ CONFIG_USB_STORAGE_CLASSIC=y
CONFIG_USB_XHCI=y
CONFIG_USB_XHCI_NEC=y
CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_HUB=y
+CONFIG_USB_HID=y
CONFIG_VFIO=y
CONFIG_VFIO_PCI=y
CONFIG_VGA=y
--
2.39.5 (Apple Git-154)

View File

@ -0,0 +1,45 @@
From d26f4a804b173a68cb8d085ec6dca45cf7f72dcb Mon Sep 17 00:00:00 2001
From: Igor Mammedov <imammedo@redhat.com>
Date: Wed, 8 May 2024 11:10:54 +0200
Subject: [PATCH] target/i386: fix feature dependency for WAITPKG
RH-Author: Igor Mammedov <imammedo@redhat.com>
RH-MergeRequest: 438: target/i386: fix feature dependency for WAITPKG
RH-Jira: RHEL-84866
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
RH-Commit: [1/1] 5c774fe64acd0396b1bdca8c5a8d0c3836b42b6a
JIRA: https://issues.redhat.com/browse/RHEL-84866
The VMX feature bit depends on general availability of WAITPKG,
not the other way round.
Fixes: 33cc88261c3 ("target/i386: add support for VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE", 2023-08-28)
Cc: qemu-stable@nongnu.org
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit fe01af5d47d4cf7fdf90c54d43f784e5068c8d72)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
target/i386/cpu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 13737cd703..9af105763f 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1550,8 +1550,8 @@ static FeatureDep feature_dependencies[] = {
.to = { FEAT_SVM, ~0ull },
},
{
- .from = { FEAT_VMX_SECONDARY_CTLS, VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE },
- .to = { FEAT_7_0_ECX, CPUID_7_0_ECX_WAITPKG },
+ .from = { FEAT_7_0_ECX, CPUID_7_0_ECX_WAITPKG },
+ .to = { FEAT_VMX_SECONDARY_CTLS, VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE },
},
};
--
2.48.1

View File

@ -151,7 +151,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version} \
Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm
Version: 9.0.0
Release: 10%{?rcrel}%{?dist}%{?cc_suffix}.2.alma.1
Release: 10%{?rcrel}%{?dist}%{?cc_suffix}.3.alma.1
# 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)
@ -458,6 +458,12 @@ Patch148: kvm-tests-migration-tests-Verify-postcopy-recover-setup-.patch
Patch149: kvm-tests-migration-tests-Cover-postcopy-failure-on-reco.patch
# For RHEL-73006 - qemu-kvm: vhost: reports error while updating IOTLB entries [rhel-9.5.z]
Patch150: kvm-vhost-fail-device-start-if-iotlb-update-fails.patch
# For RHEL-84866 - Live migration after workload update fails with operation failed: guest CPU doesn't match specification: missing features: waitpkg [rhel-9.5.z]
Patch151: kvm-target-i386-fix-feature-dependency-for-WAITPKG.patch
# AlmaLinux Patch
Patch152: 0001-Bring-back-missing-line-in-target-ppc-cpu-models.patch
Patch153: 0001-usb-add-config-options-for-hub-and-hid-devices-for-p.patch
%if %{have_clang}
BuildRequires: clang
@ -1530,9 +1536,15 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%endif
%changelog
* Tue Apr 08 2025 Eduard Abdullin <eabdullin@almalinux.org> - 17:9.0.0-10.2.alma.1
* Wed May 07 2025 Eduard Abdullin <eabdullin@almalinux.org> - 17:9.0.0-10.3.alma.1
- Enable building for ppc64le
- Don't remove slof.bin for ppc64le
- usb: add config options for hub and hid devices for ppc
* Mon Mar 31 2025 Jon Maloy <jmaloy@redhat.com> - 9.0.0-10.el9_5.3
- kvm-target-i386-fix-feature-dependency-for-WAITPKG.patch [RHEL-84866]
- Resolves: RHEL-84866
(Live migration after workload update fails with operation failed: guest CPU doesn't match specification: missing features: waitpkg [rhel-9.5.z])
* Wed Jan 15 2025 Miroslav Rezanina <mrezanin@redhat.com> - 9.0.0-10.el9_5.2
- kvm-vhost-fail-device-start-if-iotlb-update-fails.patch [RHEL-73006]