cpu: move the CPU map data files into a src/cpu_map directory

In preparation for splitting up the CPU map data file, move it into a
dedicated directory of its own.

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/libvirt.spec.in b/libvirt.spec.in
index e7196b7d3b422c6e52dfedd01cbe9a48010b9fa0..cc2e662e2707fb8e39b3c5dec4d47c514777cdef 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1863,7 +1863,7 @@ exit 0
 %{_datadir}/libvirt/schemas/storagepool.rng
 %{_datadir}/libvirt/schemas/storagevol.rng
 
-%{_datadir}/libvirt/cpu_map.xml
+%{_datadir}/libvirt/cpu_map/*.xml
 
 %{_datadir}/libvirt/test-screenshot.png
 

diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in
index cc1e61992716f1557694d84db1e6341b722648f6..b28e40f7f7e452ead2418fd8485249a5fc13592d 100644 (file)
--- a/mingw-libvirt.spec.in
+++ b/mingw-libvirt.spec.in
@@ -260,7 +260,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 %{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml
 
-%{mingw32_datadir}/libvirt/cpu_map.xml
+%{mingw32_datadir}/libvirt/cpu_map/*.xml
 
 %{mingw32_datadir}/libvirt/test-screenshot.png
 
@@ -347,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 %{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml
 
-%{mingw64_datadir}/libvirt/cpu_map.xml
+%{mingw64_datadir}/libvirt/cpu_map/*.xml
 
 %{mingw64_datadir}/libvirt/test-screenshot.png
 

diff --git a/src/Makefile.am b/src/Makefile.am
index db8c8ebd1addf1380a4a777a3ff1f8d11456824f..2a3ed0d42d1f6292674f70cfc5932207ecb83fe0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,6 +100,7 @@ man7_MANS =
 include util/Makefile.inc.am
 include conf/Makefile.inc.am
 include cpu/Makefile.inc.am
+include cpu_map/Makefile.inc.am
 include security/Makefile.inc.am
 include access/Makefile.inc.am
 include logging/Makefile.inc.am
@@ -364,12 +365,6 @@ check-local: check-protocol check-symfile check-symsorting \
 .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
 
 
-
-
-pkgdata_DATA = cpu/cpu_map.xml
-
-EXTRA_DIST +=  $(pkgdata_DATA)
-
 #########################
 #
 # Build up list of libvirt.la source files based on configure conditions

diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index ac7e58037a7bda15dfbd6d7578511a0e2b20cacc..4585e5ca83d6392261da97ca6c221df225646354 100644 (file)
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -99,8 +99,8 @@ cpuMapLoadInclude(const char *filename,
     char *mapfile;
 
     if (!(mapfile = virFileFindResource(filename,
-                                        abs_topsrcdir "/src/cpu",
-                                        PKGDATADIR)))
+                                        abs_topsrcdir "/src/cpu_map",
+                                        PKGDATADIR "/cpu_map")))
         return -1;
 
     VIR_DEBUG("Loading CPU map include from %s", mapfile);
@@ -187,9 +187,9 @@ int cpuMapLoad(const char *arch,
     int ret = -1;
     char *mapfile;
 
-    if (!(mapfile = virFileFindResource("cpu_map.xml",
-                                        abs_topsrcdir "/src/cpu",
-                                        PKGDATADIR)))
+    if (!(mapfile = virFileFindResource("index.xml",
+                                        abs_topsrcdir "/src/cpu_map",
+                                        PKGDATADIR "/cpu_map")))
         return -1;
 
     VIR_DEBUG("Loading '%s' CPU map from %s", NULLSTR(arch), mapfile);

diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
new file mode 100644 (file)
index 0000000..67d8ddf
--- /dev/null
+++ b/src/cpu_map/Makefile.inc.am
@@ -0,0 +1,6 @@
+cpumapdir = $(pkgdatadir)/cpu_map
+cpumap_DATA = \
+       cpu_map/index.xml \
+       $(NULL)
+
+EXTRA_DIST += $(cpumap_DATA)

diff --git a/src/cpu/cpu_map.xml b/src/cpu_map/index.xml
similarity index 100%
rename from src/cpu/cpu_map.xml
rename to src/cpu_map/index.xml