libvirt/libvirt-cpu_map-Sort-data-files-in-meson.build.patch
Jiri Denemark 733f87f1f7 libvirt-10.10.0-2.el10
- util: Fix typo in virNetDevOpenvswitchInterfaceSetQos (RHEL-69840)
- qemu: tpm: do not update profile name for transient domains (RHEL-69774)
- qemu: Enable I/O APIC if needed (RHEL-71414)
- cpu_map: Sort data files in meson.build (RHEL-70129)
- sync_qemu_models_i386: Update meson.build (RHEL-70129)
- sync_qemu_models_i386: Generate missing -v1 variants (RHEL-70129)
- cpu_map: Add 486-v1 CPU model (RHEL-70129)
- cpu_map: Add pentium-v1 CPU model (RHEL-70129)
- cpu_map: Add pentium2-v1 CPU model (RHEL-70129)
- cpu_map: Add pentium3-v1 CPU model (RHEL-70129)
- cpu_map: Add coreduo-v1 CPU model (RHEL-70129)
- cpu_map: Add n270-v1 CPU model (RHEL-70129)
- cpu_map: Add core2duo-v1 CPU model (RHEL-70129)
- cpu_map: Add qemu32-v1 CPU model (RHEL-70129)
- cpu_map: Add kvm32-v1 CPU model (RHEL-70129)
- cpu_map: Add qemu64-v1 CPU model (RHEL-70129)
- cpu_map: Add kvm64-v1 CPU model (RHEL-70129)
- cpu_map: Add Conroe-v1 CPU model (RHEL-70129)
- cpu_map: Add Penryn-v1 CPU model (RHEL-70129)
- cpu_map: Add KnightsMill-v1 CPU model (RHEL-70129)
- cpu_map: Add athlon-v1 CPU model (RHEL-70129)
- cpu_map: Add phenom-v1 CPU model (RHEL-70129)
- cpu_map: Add Opteron_G1-v1 CPU model (RHEL-70129)
- cpu_map: Add Opteron_G2-v1 CPU model (RHEL-70129)
- cpu_map: Add Opteron_G3-v1 CPU model (RHEL-70129)
- cpu_map: Add Opteron_G4-v1 CPU model (RHEL-70129)
- cpu_map: Add Opteron_G5-v1 CPU model (RHEL-70129)
- cpu_map: Add EPYC-Genoa-v1 CPU model (RHEL-70129)

Resolves: RHEL-69774, RHEL-69840, RHEL-70129, RHEL-71414
2024-12-17 10:59:14 +01:00

74 lines
2.0 KiB
Diff

From 00f259cc2d6abfd44424b7faf485fbe3301bfe49 Mon Sep 17 00:00:00 2001
Message-ID: <00f259cc2d6abfd44424b7faf485fbe3301bfe49.1734429553.git.jdenemar@redhat.com>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 28 Nov 2024 13:24:49 +0100
Subject: [PATCH] cpu_map: Sort data files in meson.build
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
(cherry picked from commit 50c6d727b6f0cc00333a1bc26925ab5f26f8f781)
https://issues.redhat.com/browse/RHEL-70129
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
src/cpu_map/meson.build | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 88d67f4cce..f659ef230e 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -4,8 +4,8 @@ cpumap_data = [
'arm_cortex-a57.xml',
'arm_cortex-a72.xml',
'arm_Falkor.xml',
- 'arm_FT-2000plus.xml',
'arm_features.xml',
+ 'arm_FT-2000plus.xml',
'arm_Kunpeng-920.xml',
'arm_Neoverse-N1.xml',
'arm_Neoverse-N2.xml',
@@ -14,11 +14,11 @@ cpumap_data = [
'arm_ThunderX299xx.xml',
'arm_vendors.xml',
'index.xml',
+ 'ppc64_POWER10.xml',
'ppc64_POWER6.xml',
'ppc64_POWER7.xml',
'ppc64_POWER8.xml',
'ppc64_POWER9.xml',
- 'ppc64_POWER10.xml',
'ppc64_POWERPC_e5500.xml',
'ppc64_POWERPC_e6500.xml',
'ppc64_vendors.xml',
@@ -54,13 +54,8 @@ cpumap_data = [
'x86_Dhyana-v1.xml',
'x86_Dhyana-v2.xml',
'x86_Dhyana.xml',
- 'x86_EPYC-IBPB.xml',
- 'x86_EPYC-v1.xml',
- 'x86_EPYC-v2.xml',
- 'x86_EPYC-v3.xml',
- 'x86_EPYC-v4.xml',
- 'x86_EPYC.xml',
'x86_EPYC-Genoa.xml',
+ 'x86_EPYC-IBPB.xml',
'x86_EPYC-Milan-v1.xml',
'x86_EPYC-Milan-v2.xml',
'x86_EPYC-Milan.xml',
@@ -69,6 +64,11 @@ cpumap_data = [
'x86_EPYC-Rome-v3.xml',
'x86_EPYC-Rome-v4.xml',
'x86_EPYC-Rome.xml',
+ 'x86_EPYC-v1.xml',
+ 'x86_EPYC-v2.xml',
+ 'x86_EPYC-v3.xml',
+ 'x86_EPYC-v4.xml',
+ 'x86_EPYC.xml',
'x86_features.xml',
'x86_GraniteRapids-v1.xml',
'x86_GraniteRapids.xml',
--
2.47.1