openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Daniel P. Berrangé 2018-08-16 12:39:39 +01:00
parent 18cab54c3a
commit 3ecbac95cd
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvirt.spec.in
View File

@ -1863,7 +1863,7 @@ exit 0
%{_datadir}/libvirt/schemas/storagepool.rng %{_datadir}/libvirt/schemas/storagepool.rng
%{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/schemas/storagevol.rng
%{_datadir}/libvirt/cpu_map.xml %{_datadir}/libvirt/cpu_map/*.xml
%{_datadir}/libvirt/test-screenshot.png %{_datadir}/libvirt/test-screenshot.png

4
mingw-libvirt.spec.in
View File

@ -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-qemu-api.xml
%{mingw32_datadir}/libvirt/api/libvirt-admin-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 %{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-qemu-api.xml
%{mingw64_datadir}/libvirt/api/libvirt-admin-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 %{mingw64_datadir}/libvirt/test-screenshot.png

7
src/Makefile.am
View File

@ -100,6 +100,7 @@ man7_MANS =
include util/Makefile.inc.am include util/Makefile.inc.am
include conf/Makefile.inc.am include conf/Makefile.inc.am
include cpu/Makefile.inc.am include cpu/Makefile.inc.am
include cpu_map/Makefile.inc.am
include security/Makefile.inc.am include security/Makefile.inc.am
include access/Makefile.inc.am include access/Makefile.inc.am
include logging/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) .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 # Build up list of libvirt.la source files based on configure conditions

10
src/cpu/cpu_map.c
View File

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

6
src/cpu_map/Makefile.inc.am Normal file
View File

@ -0,0 +1,6 @@
cpumapdir = $(pkgdatadir)/cpu_map
cpumap_DATA = \
cpu_map/index.xml \
$(NULL)
EXTRA_DIST += $(cpumap_DATA)

0
src/cpu/cpu_map.xml → src/cpu_map/index.xml
View File