4:56 a.m.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/Makefile.am | 1 -
src/cpu_map/Makefile.inc.am | 78 -------------------------------------
src/cpu_map/meson.build | 75 +++++++++++++++++++++++++++++++++++
src/meson.build | 2 +
4 files changed, 77 insertions(+), 79 deletions(-)
delete mode 100644 src/cpu_map/Makefile.inc.am
create mode 100644 src/cpu_map/meson.build
diff --git a/src/Makefile.am b/src/Makefile.am
index b83a087b716..e727ad32944 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,7 +67,6 @@ COMMON_UNIT_VARS = \
lib_LTLIBRARIES += libvirt-qemu.la libvirt-lxc.la
include util/Makefile.inc.am
-include cpu_map/Makefile.inc.am
include security/Makefile.inc.am
include access/Makefile.inc.am
include logging/Makefile.inc.am
diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
deleted file mode 100644
index d3ccb880733..00000000000
--- a/src/cpu_map/Makefile.inc.am
+++ /dev/null
@@ -1,78 +0,0 @@
-# vim: filetype=automake
-
-cpumapdir = $(pkgdatadir)/cpu_map
-cpumap_DATA = \
- cpu_map/arm_cortex-a53.xml \
- cpu_map/arm_cortex-a57.xml \
- cpu_map/arm_cortex-a72.xml \
- cpu_map/arm_features.xml \
- cpu_map/arm_Kunpeng-920.xml \
- cpu_map/arm_ThunderX299xx.xml \
- cpu_map/arm_Falkor.xml \
- cpu_map/arm_vendors.xml \
- cpu_map/index.xml \
- cpu_map/ppc64_vendors.xml \
- cpu_map/ppc64_POWER7.xml \
- cpu_map/ppc64_POWER9.xml \
- cpu_map/ppc64_POWERPC_e6500.xml \
- cpu_map/ppc64_POWER6.xml \
- cpu_map/ppc64_POWER8.xml \
- cpu_map/ppc64_POWERPC_e5500.xml \
- cpu_map/x86_features.xml \
- cpu_map/x86_vendors.xml \
- cpu_map/x86_486.xml \
- cpu_map/x86_athlon.xml \
- cpu_map/x86_Broadwell.xml \
- cpu_map/x86_Broadwell-IBRS.xml \
- cpu_map/x86_Broadwell-noTSX.xml \
- cpu_map/x86_Broadwell-noTSX-IBRS.xml \
- cpu_map/x86_Cascadelake-Server.xml \
- cpu_map/x86_Cascadelake-Server-noTSX.xml \
- cpu_map/x86_Conroe.xml \
- cpu_map/x86_Cooperlake.xml \
- cpu_map/x86_core2duo.xml \
- cpu_map/x86_coreduo.xml \
- cpu_map/x86_cpu64-rhel5.xml \
- cpu_map/x86_cpu64-rhel6.xml \
- cpu_map/x86_Dhyana.xml \
- cpu_map/x86_EPYC.xml \
- cpu_map/x86_EPYC-IBPB.xml \
- cpu_map/x86_Haswell.xml \
- cpu_map/x86_Haswell-IBRS.xml \
- cpu_map/x86_Haswell-noTSX.xml \
- cpu_map/x86_Haswell-noTSX-IBRS.xml \
- cpu_map/x86_Icelake-Client.xml \
- cpu_map/x86_Icelake-Client-noTSX.xml \
- cpu_map/x86_Icelake-Server.xml \
- cpu_map/x86_Icelake-Server-noTSX.xml \
- cpu_map/x86_IvyBridge.xml \
- cpu_map/x86_IvyBridge-IBRS.xml \
- cpu_map/x86_kvm32.xml \
- cpu_map/x86_kvm64.xml \
- cpu_map/x86_n270.xml \
- cpu_map/x86_Nehalem.xml \
- cpu_map/x86_Nehalem-IBRS.xml \
- cpu_map/x86_Opteron_G1.xml \
- cpu_map/x86_Opteron_G2.xml \
- cpu_map/x86_Opteron_G3.xml \
- cpu_map/x86_Opteron_G4.xml \
- cpu_map/x86_Opteron_G5.xml \
- cpu_map/x86_Penryn.xml \
- cpu_map/x86_pentium.xml \
- cpu_map/x86_pentium2.xml \
- cpu_map/x86_pentium3.xml \
- cpu_map/x86_pentiumpro.xml \
- cpu_map/x86_phenom.xml \
- cpu_map/x86_qemu32.xml \
- cpu_map/x86_qemu64.xml \
- cpu_map/x86_SandyBridge.xml \
- cpu_map/x86_SandyBridge-IBRS.xml \
- cpu_map/x86_Skylake-Client.xml \
- cpu_map/x86_Skylake-Client-IBRS.xml \
- cpu_map/x86_Skylake-Client-noTSX-IBRS.xml \
- cpu_map/x86_Skylake-Server.xml \
- cpu_map/x86_Skylake-Server-IBRS.xml \
- cpu_map/x86_Skylake-Server-noTSX-IBRS.xml \
- cpu_map/x86_Westmere.xml \
- cpu_map/x86_Westmere-IBRS.xml \
- $(NULL)
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
new file mode 100644
index 00000000000..d89106dfcbd
--- /dev/null
+++ b/src/cpu_map/meson.build
@@ -0,0 +1,75 @@
+cpumap_data = [
+ 'arm_cortex-a53.xml',
+ 'arm_cortex-a57.xml',
+ 'arm_cortex-a72.xml',
+ 'arm_Falkor.xml',
+ 'arm_features.xml',
+ 'arm_Kunpeng-920.xml',
+ 'arm_ThunderX299xx.xml',
+ 'arm_vendors.xml',
+ 'index.xml',
+ 'ppc64_POWER6.xml',
+ 'ppc64_POWER7.xml',
+ 'ppc64_POWER8.xml',
+ 'ppc64_POWER9.xml',
+ 'ppc64_POWERPC_e5500.xml',
+ 'ppc64_POWERPC_e6500.xml',
+ 'ppc64_vendors.xml',
+ 'x86_486.xml',
+ 'x86_athlon.xml',
+ 'x86_Broadwell-IBRS.xml',
+ 'x86_Broadwell-noTSX-IBRS.xml',
+ 'x86_Broadwell-noTSX.xml',
+ 'x86_Broadwell.xml',
+ 'x86_Cascadelake-Server.xml',
+ 'x86_Conroe.xml',
+ 'x86_Cooperlake.xml',
+ 'x86_core2duo.xml',
+ 'x86_coreduo.xml',
+ 'x86_cpu64-rhel5.xml',
+ 'x86_cpu64-rhel6.xml',
+ 'x86_EPYC-IBPB.xml',
+ 'x86_EPYC.xml',
+ 'x86_features.xml',
+ 'x86_Haswell-IBRS.xml',
+ 'x86_Haswell-noTSX-IBRS.xml',
+ 'x86_Haswell-noTSX.xml',
+ 'x86_Haswell.xml',
+ 'x86_Icelake-Client-noTSX.xml',
+ 'x86_Icelake-Client.xml',
+ 'x86_Icelake-Server-noTSX.xml',
+ 'x86_Icelake-Server.xml',
+ 'x86_IvyBridge-IBRS.xml',
+ 'x86_IvyBridge.xml',
+ 'x86_kvm32.xml',
+ 'x86_kvm64.xml',
+ 'x86_n270.xml',
+ 'x86_Nehalem-IBRS.xml',
+ 'x86_Nehalem.xml',
+ 'x86_Opteron_G1.xml',
+ 'x86_Opteron_G2.xml',
+ 'x86_Opteron_G3.xml',
+ 'x86_Opteron_G4.xml',
+ 'x86_Opteron_G5.xml',
+ 'x86_Penryn.xml',
+ 'x86_pentium.xml',
+ 'x86_pentium2.xml',
+ 'x86_pentium3.xml',
+ 'x86_pentiumpro.xml',
+ 'x86_phenom.xml',
+ 'x86_qemu32.xml',
+ 'x86_qemu64.xml',
+ 'x86_SandyBridge-IBRS.xml',
+ 'x86_SandyBridge.xml',
+ 'x86_Skylake-Client-IBRS.xml',
+ 'x86_Skylake-Client-noTSX-IBRS.xml',
+ 'x86_Skylake-Client.xml',
+ 'x86_Skylake-Server-IBRS.xml',
+ 'x86_Skylake-Server-noTSX-IBRS.xml',
+ 'x86_Skylake-Server.xml',
+ 'x86_vendors.xml',
+ 'x86_Westmere-IBRS.xml',
+ 'x86_Westmere.xml',
+]
+
+install_data(cpumap_data, install_dir: pkgdatadir / 'cpu_map')
diff --git a/src/meson.build b/src/meson.build
index b6b9da32df6..748bb7a9914 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -121,6 +121,8 @@ libvirt_libs = []
# list subdirectories
+subdir('cpu_map')
+
subdir('util')
src_dep = declare_dependency(
--
2.26.2