On Thu, Apr 24, 2014 at 04:18:02PM -0600, Eric Blake wrote:
On 04/24/2014 10:05 AM, Daniel P. Berrange wrote:
Replace use of cpuMapOverride with virFileFindResource to locate CPU map from build dir.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- daemon/libvirtd.c | 19 ------------------- src/cpu/cpu_map.c | 31 ++++++++++--------------------- src/cpu/cpu_map.h | 3 --- tests/cputest.c | 14 -------------- tests/qemuxml2argvtest.c | 7 ------- tests/qemuxmlnstest.c | 7 ------- 6 files changed, 10 insertions(+), 71 deletions(-)
I still wonder if we should try to get rid of the automake magic that symlinks the git copy of the file into builddir on a VPATH build, by having virFileFindResource learn how to look in two separate locations for VPATH builds. But it's not a show-stopper, and could certainly be a separate patch.
I considered doing that, but it would imply that this FindResource function has to starting stat()'ing files in dirs to see if they exists, so I decided against that. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|