2005-11-02 12:50:21 +00:00
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
|
2012-01-06 23:07:34 +00:00
|
|
|
## Copyright (C) 2005-2012 Red Hat, Inc.
|
2011-07-28 18:56:24 +00:00
|
|
|
## See COPYING.LIB for the License of this software
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
# No libraries with the exception of LIBXML should be listed
|
|
|
|
# here. List them against the individual XXX_la_CFLAGS targets
|
2011-07-28 12:55:21 +00:00
|
|
|
# that actually use them. Also keep GETTEXT_CPPFLAGS at the end.
|
2012-02-02 20:20:09 +00:00
|
|
|
INCLUDES = -I../gnulib/lib \
|
|
|
|
-I$(top_srcdir)/gnulib/lib \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
-I../include \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/include \
|
|
|
|
-I$(top_srcdir)/src/util \
|
2011-07-28 12:55:21 +00:00
|
|
|
-DIN_LIBVIRT \
|
|
|
|
$(GETTEXT_CPPFLAGS)
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
|
|
|
|
AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(LIBXML_CFLAGS) \
|
|
|
|
$(WARN_CFLAGS) \
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
$(LOCK_CHECKING_CFLAGS) \
|
|
|
|
$(WIN32_EXTRA_CFLAGS) \
|
|
|
|
$(COVERAGE_CFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
|
|
|
|
2011-07-21 07:02:52 +00:00
|
|
|
EXTRA_DIST = $(conf_DATA) util/keymaps.csv
|
2007-10-12 19:54:15 +00:00
|
|
|
|
2010-03-06 16:56:28 +00:00
|
|
|
BUILT_SOURCES =
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
CLEANFILES =
|
|
|
|
DISTCLEANFILES =
|
|
|
|
MAINTAINERCLEANFILES =
|
2010-03-06 16:56:28 +00:00
|
|
|
|
2011-11-04 20:53:15 +00:00
|
|
|
THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
|
|
|
|
|
2009-09-16 11:31:13 +00:00
|
|
|
if WITH_NETWORK
|
|
|
|
UUID=$(shell uuidgen 2>/dev/null)
|
|
|
|
endif
|
2005-11-02 15:37:34 +00:00
|
|
|
|
2010-04-13 18:02:46 +00:00
|
|
|
lib_LTLIBRARIES = libvirt.la libvirt-qemu.la
|
2007-06-15 01:21:18 +00:00
|
|
|
|
2011-01-21 17:42:07 +00:00
|
|
|
moddir = $(libdir)/libvirt/connection-driver
|
2008-11-21 12:16:08 +00:00
|
|
|
mod_LTLIBRARIES =
|
|
|
|
|
2009-10-08 15:40:14 +00:00
|
|
|
confdir = $(sysconfdir)/libvirt
|
2011-10-13 10:49:45 +00:00
|
|
|
conf_DATA = libvirt.conf
|
2008-11-21 12:16:08 +00:00
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
augeasdir = $(datadir)/augeas/lenses
|
|
|
|
augeas_DATA =
|
|
|
|
|
|
|
|
augeastestdir = $(datadir)/augeas/lenses/tests
|
|
|
|
augeastest_DATA =
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# These files are not related to driver APIs. Simply generic
|
|
|
|
# helper APIs for various purposes
|
2008-11-17 10:43:30 +00:00
|
|
|
UTIL_SOURCES = \
|
2010-05-21 04:23:48 +00:00
|
|
|
util/bitmap.c util/bitmap.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/buf.c util/buf.h \
|
2010-05-25 11:14:06 +00:00
|
|
|
util/command.c util/command.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/conf.c util/conf.h \
|
|
|
|
util/cgroup.c util/cgroup.h \
|
|
|
|
util/event.c util/event.h \
|
2011-02-24 17:58:04 +00:00
|
|
|
util/event_poll.c util/event_poll.h \
|
2010-03-26 14:49:45 +00:00
|
|
|
util/hooks.c util/hooks.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/iptables.c util/iptables.h \
|
2009-11-03 22:11:01 +00:00
|
|
|
util/ebtables.c util/ebtables.h \
|
2010-04-26 13:56:03 +00:00
|
|
|
util/dnsmasq.c util/dnsmasq.h \
|
2009-11-03 18:59:18 +00:00
|
|
|
util/json.c util/json.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/logging.c util/logging.h \
|
|
|
|
util/memory.c util/memory.h \
|
|
|
|
util/pci.c util/pci.h \
|
2009-11-16 15:22:34 +00:00
|
|
|
util/processinfo.c util/processinfo.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/hostusb.c util/hostusb.h \
|
2011-02-21 13:40:06 +00:00
|
|
|
util/sexpr.c util/sexpr.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/stats_linux.c util/stats_linux.h \
|
2009-09-25 13:20:13 +00:00
|
|
|
util/storage_file.c util/storage_file.h \
|
2010-11-05 14:22:13 +00:00
|
|
|
util/sysinfo.c util/sysinfo.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/threads.c util/threads.h \
|
|
|
|
util/threads-pthread.h \
|
|
|
|
util/threads-win32.h \
|
2010-12-08 06:19:06 +00:00
|
|
|
util/threadpool.c util/threadpool.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/uuid.c util/uuid.h \
|
|
|
|
util/util.c util/util.h \
|
2012-07-11 13:35:43 +00:00
|
|
|
util/viratomic.h util/viratomic.c \
|
2011-07-11 19:42:15 +00:00
|
|
|
util/viraudit.c util/viraudit.h \
|
2012-03-19 16:21:12 +00:00
|
|
|
util/virauth.c util/virauth.h \
|
2012-03-20 15:40:05 +00:00
|
|
|
util/virauthconfig.c util/virauthconfig.h \
|
2011-07-19 18:32:58 +00:00
|
|
|
util/virfile.c util/virfile.h \
|
Implement the core API to suspend/resume the host
Add the core functions that implement the functionality of the API.
Suspend is done by using an asynchronous mechanism so that we can return
the status to the caller before the host gets suspended. This asynchronous
operation is achieved by suspending the host in a separate thread of
execution. However, returning the status to the caller is only best-effort,
but not guaranteed.
To resume the host, an RTC alarm is set up (based on how long we want to
suspend) before suspending the host. When this alarm fires, the host
gets woken up.
Suspend-to-RAM operation on a host running Linux can take upto more than 20
seconds, depending on the load of the system. (Freezing of tasks, an operation
preceding any suspend operation, is given up after a 20 second timeout).
And Suspend-to-Disk can take even more time, considering the time required
for compaction, creating the memory image and writing it to disk etc.
So, we do not allow the user to specify a suspend duration of less than 60
seconds, to be on the safer side, since we don't want to prematurely declare
failure when we only had to wait for some more time.
2011-11-29 09:07:38 +00:00
|
|
|
util/virnodesuspend.c util/virnodesuspend.h \
|
Add a generic reference counted virObject type
This introduces a fairly basic reference counted virObject type
and an associated virClass type, that use atomic operations for
ref counting.
In a global initializer (recommended to be invoked using the
virOnceInit API), a virClass type must be allocated for each
object type. This requires a class name, a "dispose" callback
which will be invoked to free memory associated with the object's
fields, and the size in bytes of the object struct.
eg,
virClassPtr connclass = virClassNew("virConnect",
sizeof(virConnect),
virConnectDispose);
The struct for the object, must include 'virObject' as its
first member
eg
struct _virConnect {
virObject object;
virURIPtr uri;
};
The 'dispose' callback is only responsible for freeing
fields in the object, not the object itself. eg a suitable
impl for the above struct would be
void virConnectDispose(void *obj) {
virConnectPtr conn = obj;
virURIFree(conn->uri);
}
There is no need to reset fields to 'NULL' or '0' in the
dispose callback, since the entire object will be memset
to 0, and the klass pointer & magic integer fields will
be poisoned with 0xDEADBEEF before being free()d
When creating an instance of an object, one needs simply
pass the virClassPtr eg
virConnectPtr conn = virObjectNew(connclass);
if (!conn)
return NULL;
conn->uri = virURIParse("foo:///bar")
Object references can be manipulated with
virObjectRef(conn)
virObjectUnref(conn)
The latter returns a true value, if the object has been
freed (ie its ref count hit zero)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-11 13:35:44 +00:00
|
|
|
util/virobject.c util/virobject.h \
|
2011-08-05 13:13:12 +00:00
|
|
|
util/virpidfile.c util/virpidfile.h \
|
2012-01-02 22:03:19 +00:00
|
|
|
util/virtypedparam.c util/virtypedparam.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/xml.c util/xml.h \
|
2011-07-21 07:32:34 +00:00
|
|
|
util/virterror.c util/virterror_internal.h \
|
2012-04-19 14:34:35 +00:00
|
|
|
util/virdbus.c util/virdbus.h \
|
2012-01-25 16:13:59 +00:00
|
|
|
util/virhash.c util/virhash.h \
|
2012-01-18 16:10:43 +00:00
|
|
|
util/virhashcode.c util/virhashcode.h \
|
2011-07-21 07:32:34 +00:00
|
|
|
util/virkeycode.c util/virkeycode.h \
|
2012-03-16 16:29:49 +00:00
|
|
|
util/virkeyfile.c util/virkeyfile.h \
|
Split bridge.h into three separate files
Following the renaming of the bridge management APIs, we can now
split the source file into 3 corresponding pieces
* src/util/virnetdev.c: APIs for any type of network interface
* src/util/virnetdevbridge.c: APIs for bridge interfaces
* src/util/virnetdevtap.c: APIs for TAP interfaces
* src/util/virnetdev.c, src/util/virnetdev.h,
src/util/virnetdevbridge.c, src/util/virnetdevbridge.h,
src/util/virnetdevtap.c, src/util/virnetdevtap.h: Copied
from bridge.{c,h}
* src/util/bridge.c, src/util/bridge.h: Split into 3 pieces
* src/lxc/lxc_driver.c, src/network/bridge_driver.c,
src/openvz/openvz_driver.c, src/qemu/qemu_command.c,
src/qemu/qemu_conf.h, src/uml/uml_conf.c, src/uml/uml_conf.h,
src/uml/uml_driver.c: Update #include directives
2011-11-02 13:41:58 +00:00
|
|
|
util/virkeymaps.h \
|
2012-01-27 17:23:05 +00:00
|
|
|
util/virmacaddr.h util/virmacaddr.c \
|
Split bridge.h into three separate files
Following the renaming of the bridge management APIs, we can now
split the source file into 3 corresponding pieces
* src/util/virnetdev.c: APIs for any type of network interface
* src/util/virnetdevbridge.c: APIs for bridge interfaces
* src/util/virnetdevtap.c: APIs for TAP interfaces
* src/util/virnetdev.c, src/util/virnetdev.h,
src/util/virnetdevbridge.c, src/util/virnetdevbridge.h,
src/util/virnetdevtap.c, src/util/virnetdevtap.h: Copied
from bridge.{c,h}
* src/util/bridge.c, src/util/bridge.h: Split into 3 pieces
* src/lxc/lxc_driver.c, src/network/bridge_driver.c,
src/openvz/openvz_driver.c, src/qemu/qemu_command.c,
src/qemu/qemu_conf.h, src/uml/uml_conf.c, src/uml/uml_conf.h,
src/uml/uml_driver.c: Update #include directives
2011-11-02 13:41:58 +00:00
|
|
|
util/virnetdev.h util/virnetdev.c \
|
Split src/util/network.{c,h} into 5 pieces
The src/util/network.c file is a dumping ground for many different
APIs. Split it up into 5 pieces, along functional lines
- src/util/virnetdevbandwidth.c: virNetDevBandwidth type & helper APIs
- src/util/virnetdevvportprofile.c: virNetDevVPortProfile type & helper APIs
- src/util/virsocketaddr.c: virSocketAddr and APIs
- src/conf/netdev_bandwidth_conf.c: XML parsing / formatting
for virNetDevBandwidth
- src/conf/netdev_vport_profile_conf.c: XML parsing / formatting
for virNetDevVPortProfile
* src/util/network.c, src/util/network.h: Split into 5 pieces
* src/conf/netdev_bandwidth_conf.c, src/conf/netdev_bandwidth_conf.h,
src/conf/netdev_vport_profile_conf.c, src/conf/netdev_vport_profile_conf.h,
src/util/virnetdevbandwidth.c, src/util/virnetdevbandwidth.h,
src/util/virnetdevvportprofile.c, src/util/virnetdevvportprofile.h,
src/util/virsocketaddr.c, src/util/virsocketaddr.h: New pieces
* daemon/libvirtd.h, daemon/remote.c, src/conf/domain_conf.c,
src/conf/domain_conf.h, src/conf/network_conf.c,
src/conf/network_conf.h, src/conf/nwfilter_conf.h,
src/esx/esx_util.h, src/network/bridge_driver.c,
src/qemu/qemu_conf.c, src/rpc/virnetsocket.c,
src/rpc/virnetsocket.h, src/util/dnsmasq.h, src/util/interface.h,
src/util/iptables.h, src/util/macvtap.c, src/util/macvtap.h,
src/util/virnetdev.h, src/util/virnetdevtap.c,
tools/virsh.c: Update include files
2011-11-02 15:40:08 +00:00
|
|
|
util/virnetdevbandwidth.h util/virnetdevbandwidth.c \
|
Split bridge.h into three separate files
Following the renaming of the bridge management APIs, we can now
split the source file into 3 corresponding pieces
* src/util/virnetdev.c: APIs for any type of network interface
* src/util/virnetdevbridge.c: APIs for bridge interfaces
* src/util/virnetdevtap.c: APIs for TAP interfaces
* src/util/virnetdev.c, src/util/virnetdev.h,
src/util/virnetdevbridge.c, src/util/virnetdevbridge.h,
src/util/virnetdevtap.c, src/util/virnetdevtap.h: Copied
from bridge.{c,h}
* src/util/bridge.c, src/util/bridge.h: Split into 3 pieces
* src/lxc/lxc_driver.c, src/network/bridge_driver.c,
src/openvz/openvz_driver.c, src/qemu/qemu_command.c,
src/qemu/qemu_conf.h, src/uml/uml_conf.c, src/uml/uml_conf.h,
src/uml/uml_driver.c: Update #include directives
2011-11-02 13:41:58 +00:00
|
|
|
util/virnetdevbridge.h util/virnetdevbridge.c \
|
2011-11-02 17:11:02 +00:00
|
|
|
util/virnetdevmacvlan.c util/virnetdevmacvlan.h \
|
2012-02-10 21:09:00 +00:00
|
|
|
util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \
|
Split src/util/network.{c,h} into 5 pieces
The src/util/network.c file is a dumping ground for many different
APIs. Split it up into 5 pieces, along functional lines
- src/util/virnetdevbandwidth.c: virNetDevBandwidth type & helper APIs
- src/util/virnetdevvportprofile.c: virNetDevVPortProfile type & helper APIs
- src/util/virsocketaddr.c: virSocketAddr and APIs
- src/conf/netdev_bandwidth_conf.c: XML parsing / formatting
for virNetDevBandwidth
- src/conf/netdev_vport_profile_conf.c: XML parsing / formatting
for virNetDevVPortProfile
* src/util/network.c, src/util/network.h: Split into 5 pieces
* src/conf/netdev_bandwidth_conf.c, src/conf/netdev_bandwidth_conf.h,
src/conf/netdev_vport_profile_conf.c, src/conf/netdev_vport_profile_conf.h,
src/util/virnetdevbandwidth.c, src/util/virnetdevbandwidth.h,
src/util/virnetdevvportprofile.c, src/util/virnetdevvportprofile.h,
src/util/virsocketaddr.c, src/util/virsocketaddr.h: New pieces
* daemon/libvirtd.h, daemon/remote.c, src/conf/domain_conf.c,
src/conf/domain_conf.h, src/conf/network_conf.c,
src/conf/network_conf.h, src/conf/nwfilter_conf.h,
src/esx/esx_util.h, src/network/bridge_driver.c,
src/qemu/qemu_conf.c, src/rpc/virnetsocket.c,
src/rpc/virnetsocket.h, src/util/dnsmasq.h, src/util/interface.h,
src/util/iptables.h, src/util/macvtap.c, src/util/macvtap.h,
src/util/virnetdev.h, src/util/virnetdevtap.c,
tools/virsh.c: Update include files
2011-11-02 15:40:08 +00:00
|
|
|
util/virnetdevtap.h util/virnetdevtap.c \
|
2011-11-02 16:03:09 +00:00
|
|
|
util/virnetdevveth.h util/virnetdevveth.c \
|
Split src/util/network.{c,h} into 5 pieces
The src/util/network.c file is a dumping ground for many different
APIs. Split it up into 5 pieces, along functional lines
- src/util/virnetdevbandwidth.c: virNetDevBandwidth type & helper APIs
- src/util/virnetdevvportprofile.c: virNetDevVPortProfile type & helper APIs
- src/util/virsocketaddr.c: virSocketAddr and APIs
- src/conf/netdev_bandwidth_conf.c: XML parsing / formatting
for virNetDevBandwidth
- src/conf/netdev_vport_profile_conf.c: XML parsing / formatting
for virNetDevVPortProfile
* src/util/network.c, src/util/network.h: Split into 5 pieces
* src/conf/netdev_bandwidth_conf.c, src/conf/netdev_bandwidth_conf.h,
src/conf/netdev_vport_profile_conf.c, src/conf/netdev_vport_profile_conf.h,
src/util/virnetdevbandwidth.c, src/util/virnetdevbandwidth.h,
src/util/virnetdevvportprofile.c, src/util/virnetdevvportprofile.h,
src/util/virsocketaddr.c, src/util/virsocketaddr.h: New pieces
* daemon/libvirtd.h, daemon/remote.c, src/conf/domain_conf.c,
src/conf/domain_conf.h, src/conf/network_conf.c,
src/conf/network_conf.h, src/conf/nwfilter_conf.h,
src/esx/esx_util.h, src/network/bridge_driver.c,
src/qemu/qemu_conf.c, src/rpc/virnetsocket.c,
src/rpc/virnetsocket.h, src/util/dnsmasq.h, src/util/interface.h,
src/util/iptables.h, src/util/macvtap.c, src/util/macvtap.h,
src/util/virnetdev.h, src/util/virnetdevtap.c,
tools/virsh.c: Update include files
2011-11-02 15:40:08 +00:00
|
|
|
util/virnetdevvportprofile.h util/virnetdevvportprofile.c \
|
2012-02-03 14:13:19 +00:00
|
|
|
util/virnetlink.c util/virnetlink.h \
|
2012-01-25 15:17:46 +00:00
|
|
|
util/virrandom.h util/virrandom.c \
|
2011-11-29 12:11:01 +00:00
|
|
|
util/virsocketaddr.h util/virsocketaddr.c \
|
2012-02-24 18:48:55 +00:00
|
|
|
util/virtime.h util/virtime.c \
|
|
|
|
util/viruri.h util/viruri.c
|
2011-07-21 07:32:34 +00:00
|
|
|
|
|
|
|
EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
|
|
|
|
$(srcdir)/util/virkeycode-mapgen.py
|
|
|
|
|
2012-06-13 03:49:22 +00:00
|
|
|
BUILT_SOURCES += $(srcdir)/util/virkeymaps.h
|
|
|
|
|
2011-07-21 07:32:34 +00:00
|
|
|
$(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv \
|
|
|
|
$(srcdir)/util/virkeycode-mapgen.py
|
2011-07-22 14:16:33 +00:00
|
|
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py <$(srcdir)/util/keymaps.csv >$@
|
2011-07-21 07:32:34 +00:00
|
|
|
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
EXTRA_DIST += util/threads-pthread.c util/threads-win32.c
|
2009-01-15 19:56:05 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Internal generic driver infrastructure
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c
|
make NUMA-initialization code more portable and more robust
qemudCapsInitNUMA and umlCapsInitNUMA were identical, so this change
factors them into a new function, virCapsInitNUMA, and puts it in
nodeinfo.c.
In addition to factoring out the duplicates, this change also
adjusts that function definition (along with its macros) so
that it works with Fedora 9's numactl version 1, and makes it
so the code will work even if someone builds the kernel with
CONFIG_NR_CPUS > 4096.
Finally, also perform this NUMA initialization for the lxc
and openvz drivers.
* src/nodeinfo.c: Include <stdint.h>, <numa.h> and "memory.h".
(virCapsInitNUMA): Rename from qemudCapsInitNUMA and umlCapsInitNUMA.
(NUMA_MAX_N_CPUS): Define depending on NUMA API version.
(n_bits, MASK_CPU_ISSET): Define, adjust, use uint64 rather than long.
* src/nodeinfo.h: Include "capabilities.h".
(virCapsInitNUMA): Declare it.
* examples/domain-events/events-c/Makefile.am:
* src/Makefile.am: Add $(NUMACTL_CFLAGS) and $(NUMACTL_LIBS) to various
compile/link-related variables.
* src/qemu_conf.c: Include "nodeinfo.h".
(qemudCapsInitNUMA): Remove duplicate code. Adjust caller.
* src/uml_conf.c (umlCapsInitNUMA): Likewise.
Include "nodeinfo.h".
* src/lxc_conf.c: Include "nodeinfo.h".
(lxcCapsInit): Perform NUMA initialization here, too.
* src/openvz_conf.c (openvzCapsInit): And here.
Include "nodeinfo.h".
* src/libvirt_sym.version.in: Add virCapsInitNUMA so that libvirtd
can link to this function.
2008-12-21 18:55:09 +00:00
|
|
|
DRIVER_SOURCES = \
|
2008-11-21 12:16:08 +00:00
|
|
|
driver.c driver.h \
|
2008-11-17 10:43:30 +00:00
|
|
|
internal.h \
|
|
|
|
datatypes.c datatypes.h \
|
2010-09-22 18:32:21 +00:00
|
|
|
fdstream.c fdstream.h \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(NODE_INFO_SOURCES) \
|
2010-09-13 13:02:58 +00:00
|
|
|
libvirt.c libvirt_internal.h \
|
2011-01-24 12:14:52 +00:00
|
|
|
locking/lock_manager.c locking/lock_manager.h \
|
|
|
|
locking/lock_driver.h \
|
2011-01-24 12:16:30 +00:00
|
|
|
locking/lock_driver_nop.h locking/lock_driver_nop.c \
|
|
|
|
locking/domain_lock.h locking/domain_lock.c
|
2008-11-17 10:43:30 +00:00
|
|
|
|
2011-01-18 18:37:45 +00:00
|
|
|
LOCK_DRIVER_SANLOCK_SOURCES = \
|
|
|
|
locking/lock_driver_sanlock.c
|
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
|
Split src/util/network.{c,h} into 5 pieces
The src/util/network.c file is a dumping ground for many different
APIs. Split it up into 5 pieces, along functional lines
- src/util/virnetdevbandwidth.c: virNetDevBandwidth type & helper APIs
- src/util/virnetdevvportprofile.c: virNetDevVPortProfile type & helper APIs
- src/util/virsocketaddr.c: virSocketAddr and APIs
- src/conf/netdev_bandwidth_conf.c: XML parsing / formatting
for virNetDevBandwidth
- src/conf/netdev_vport_profile_conf.c: XML parsing / formatting
for virNetDevVPortProfile
* src/util/network.c, src/util/network.h: Split into 5 pieces
* src/conf/netdev_bandwidth_conf.c, src/conf/netdev_bandwidth_conf.h,
src/conf/netdev_vport_profile_conf.c, src/conf/netdev_vport_profile_conf.h,
src/util/virnetdevbandwidth.c, src/util/virnetdevbandwidth.h,
src/util/virnetdevvportprofile.c, src/util/virnetdevvportprofile.h,
src/util/virsocketaddr.c, src/util/virsocketaddr.h: New pieces
* daemon/libvirtd.h, daemon/remote.c, src/conf/domain_conf.c,
src/conf/domain_conf.h, src/conf/network_conf.c,
src/conf/network_conf.h, src/conf/nwfilter_conf.h,
src/esx/esx_util.h, src/network/bridge_driver.c,
src/qemu/qemu_conf.c, src/rpc/virnetsocket.c,
src/rpc/virnetsocket.h, src/util/dnsmasq.h, src/util/interface.h,
src/util/iptables.h, src/util/macvtap.c, src/util/macvtap.h,
src/util/virnetdev.h, src/util/virnetdevtap.c,
tools/virsh.c: Update include files
2011-11-02 15:40:08 +00:00
|
|
|
NETDEV_CONF_SOURCES = \
|
|
|
|
conf/netdev_bandwidth_conf.h conf/netdev_bandwidth_conf.c \
|
|
|
|
conf/netdev_vport_profile_conf.h conf/netdev_vport_profile_conf.c
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
# XML configuration format handling sources
|
2008-08-20 20:48:35 +00:00
|
|
|
# Domain driver generic impl APIs
|
|
|
|
DOMAIN_CONF_SOURCES = \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
conf/capabilities.c conf/capabilities.h \
|
2010-06-21 18:18:31 +00:00
|
|
|
conf/domain_conf.c conf/domain_conf.h \
|
Move qemu_audit.h helpers into shared code
The LXC and UML drivers can both make use of auditing. Move
the qemu_audit.{c,h} files to src/conf/domain_audit.{c,h}
* src/conf/domain_audit.c: Rename from src/qemu/qemu_audit.c
* src/conf/domain_audit.h: Rename from src/qemu/qemu_audit.h
* src/Makefile.am: Remove qemu_audit.{c,h}, add domain_audit.{c,h}
* src/qemu/qemu_audit.h, src/qemu/qemu_cgroup.c,
src/qemu/qemu_command.c, src/qemu/qemu_driver.c,
src/qemu/qemu_hotplug.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c: Update for changed audit API names
2011-07-04 10:56:13 +00:00
|
|
|
conf/domain_audit.c conf/domain_audit.h \
|
2010-06-21 18:18:31 +00:00
|
|
|
conf/domain_nwfilter.c conf/domain_nwfilter.h
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
|
|
|
|
DOMAIN_EVENT_SOURCES = \
|
|
|
|
conf/domain_event.c conf/domain_event.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
# Network driver generic impl APIs
|
2010-03-25 17:46:07 +00:00
|
|
|
NETWORK_CONF_SOURCES = \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
conf/network_conf.c conf/network_conf.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2010-03-25 17:46:07 +00:00
|
|
|
# Network filter driver generic impl APIs
|
|
|
|
NWFILTER_PARAM_CONF_SOURCES = \
|
2010-03-31 08:19:06 +00:00
|
|
|
conf/nwfilter_params.c conf/nwfilter_params.h \
|
2012-06-01 23:32:06 +00:00
|
|
|
conf/nwfilter_ipaddrmap.c \
|
|
|
|
conf/nwfilter_ipaddrmap.h \
|
2010-03-31 08:19:06 +00:00
|
|
|
conf/nwfilter_conf.h
|
2010-03-25 17:46:07 +00:00
|
|
|
|
2012-06-01 23:32:06 +00:00
|
|
|
NWFILTER_CONF_SOURCES = \
|
2010-03-25 17:46:07 +00:00
|
|
|
$(NWFILTER_PARAM_CONF_SOURCES) \
|
|
|
|
conf/nwfilter_conf.c conf/nwfilter_conf.h
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# Storage driver generic impl APIs
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
STORAGE_CONF_SOURCES = \
|
|
|
|
conf/storage_conf.h conf/storage_conf.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-07-15 17:34:04 +00:00
|
|
|
# Interface driver generic impl APIs
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
INTERFACE_CONF_SOURCES = \
|
|
|
|
conf/interface_conf.c conf/interface_conf.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-09-01 15:27:46 +00:00
|
|
|
# Secret driver generic impl APIs
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
SECRET_CONF_SOURCES = \
|
|
|
|
conf/secret_conf.h conf/secret_conf.c
|
|
|
|
|
|
|
|
# Network driver generic impl APIs
|
|
|
|
NODE_DEVICE_CONF_SOURCES = \
|
|
|
|
conf/node_device_conf.c conf/node_device_conf.h
|
|
|
|
|
|
|
|
ENCRYPTION_CONF_SOURCES = \
|
|
|
|
conf/storage_encryption_conf.c conf/storage_encryption_conf.h
|
|
|
|
|
2009-12-18 13:44:55 +00:00
|
|
|
CPU_CONF_SOURCES = \
|
|
|
|
conf/cpu_conf.c conf/cpu_conf.h
|
2012-06-05 12:00:52 +00:00
|
|
|
|
2011-11-25 15:25:14 +00:00
|
|
|
# Safe console handling helper APIs
|
|
|
|
CONSOLE_CONF_SOURCES = \
|
|
|
|
conf/virconsole.c conf/virconsole.h
|
2009-12-18 13:44:55 +00:00
|
|
|
|
2012-06-05 12:00:52 +00:00
|
|
|
# Domain listing helpers
|
|
|
|
DOMAIN_LIST_SOURCES = \
|
|
|
|
conf/virdomainlist.c conf/virdomainlist.h
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
CONF_SOURCES = \
|
Split src/util/network.{c,h} into 5 pieces
The src/util/network.c file is a dumping ground for many different
APIs. Split it up into 5 pieces, along functional lines
- src/util/virnetdevbandwidth.c: virNetDevBandwidth type & helper APIs
- src/util/virnetdevvportprofile.c: virNetDevVPortProfile type & helper APIs
- src/util/virsocketaddr.c: virSocketAddr and APIs
- src/conf/netdev_bandwidth_conf.c: XML parsing / formatting
for virNetDevBandwidth
- src/conf/netdev_vport_profile_conf.c: XML parsing / formatting
for virNetDevVPortProfile
* src/util/network.c, src/util/network.h: Split into 5 pieces
* src/conf/netdev_bandwidth_conf.c, src/conf/netdev_bandwidth_conf.h,
src/conf/netdev_vport_profile_conf.c, src/conf/netdev_vport_profile_conf.h,
src/util/virnetdevbandwidth.c, src/util/virnetdevbandwidth.h,
src/util/virnetdevvportprofile.c, src/util/virnetdevvportprofile.h,
src/util/virsocketaddr.c, src/util/virsocketaddr.h: New pieces
* daemon/libvirtd.h, daemon/remote.c, src/conf/domain_conf.c,
src/conf/domain_conf.h, src/conf/network_conf.c,
src/conf/network_conf.h, src/conf/nwfilter_conf.h,
src/esx/esx_util.h, src/network/bridge_driver.c,
src/qemu/qemu_conf.c, src/rpc/virnetsocket.c,
src/rpc/virnetsocket.h, src/util/dnsmasq.h, src/util/interface.h,
src/util/iptables.h, src/util/macvtap.c, src/util/macvtap.h,
src/util/virnetdev.h, src/util/virnetdevtap.c,
tools/virsh.c: Update include files
2011-11-02 15:40:08 +00:00
|
|
|
$(NETDEV_CONF_SOURCES) \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(DOMAIN_CONF_SOURCES) \
|
|
|
|
$(DOMAIN_EVENT_SOURCES) \
|
|
|
|
$(NETWORK_CONF_SOURCES) \
|
2010-03-25 17:46:07 +00:00
|
|
|
$(NWFILTER_CONF_SOURCES) \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(NODE_DEVICE_CONF_SOURCES) \
|
|
|
|
$(STORAGE_CONF_SOURCES) \
|
|
|
|
$(ENCRYPTION_CONF_SOURCES) \
|
|
|
|
$(INTERFACE_CONF_SOURCES) \
|
2009-12-18 13:44:55 +00:00
|
|
|
$(SECRET_CONF_SOURCES) \
|
2011-11-25 15:25:14 +00:00
|
|
|
$(CPU_CONF_SOURCES) \
|
2012-06-05 12:00:52 +00:00
|
|
|
$(CONSOLE_CONF_SOURCES) \
|
|
|
|
$(DOMAIN_LIST_SOURCES)
|
2009-09-01 15:27:46 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# The remote RPC driver, covering domains, storage, networks, etc
|
2011-05-06 13:11:32 +00:00
|
|
|
REMOTE_DRIVER_GENERATED = \
|
2011-05-06 23:10:43 +00:00
|
|
|
$(srcdir)/remote/remote_protocol.c \
|
|
|
|
$(srcdir)/remote/remote_protocol.h \
|
|
|
|
$(srcdir)/remote/remote_client_bodies.h \
|
|
|
|
$(srcdir)/remote/qemu_protocol.c \
|
|
|
|
$(srcdir)/remote/qemu_protocol.h \
|
|
|
|
$(srcdir)/remote/qemu_client_bodies.h
|
|
|
|
|
|
|
|
REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x
|
|
|
|
QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x
|
2011-05-06 13:11:32 +00:00
|
|
|
REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL)
|
2011-04-23 10:53:57 +00:00
|
|
|
|
2010-12-10 12:27:33 +00:00
|
|
|
$(srcdir)/remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
|
|
|
|
$(REMOTE_PROTOCOL)
|
2012-05-29 21:57:31 +00:00
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
|
2012-07-20 14:31:46 +00:00
|
|
|
-k remote REMOTE $(REMOTE_PROTOCOL) > $@
|
2011-04-23 10:53:57 +00:00
|
|
|
|
2010-12-10 12:27:33 +00:00
|
|
|
$(srcdir)/remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
|
|
|
|
$(QEMU_PROTOCOL)
|
2012-05-29 21:57:31 +00:00
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
|
2012-07-20 14:31:46 +00:00
|
|
|
-k qemu QEMU $(QEMU_PROTOCOL) > $@
|
2011-05-06 13:11:32 +00:00
|
|
|
|
|
|
|
REMOTE_DRIVER_SOURCES = \
|
|
|
|
gnutls_1_0_compat.h \
|
|
|
|
remote/remote_driver.c remote/remote_driver.h \
|
|
|
|
$(REMOTE_DRIVER_GENERATED)
|
2011-04-23 10:53:57 +00:00
|
|
|
|
2011-05-06 13:11:32 +00:00
|
|
|
EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \
|
2010-12-10 12:27:33 +00:00
|
|
|
$(REMOTE_DRIVER_GENERATED)
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2010-05-07 14:01:26 +00:00
|
|
|
# Ensure that we don't change the struct or member names or member ordering
|
|
|
|
# in remote_protocol.x The embedded perl below needs a few comments, and
|
|
|
|
# presumes you know what pdwtags output looks like:
|
|
|
|
# * use -0777 -n to slurp the entire file into $_.
|
|
|
|
# * the "split" splits on the /* DD */ comments, so that $p iterates
|
|
|
|
# through the struct definitions.
|
|
|
|
# * process only "struct remote_..." entries
|
|
|
|
# * remove comments and preceding TAB throughout
|
|
|
|
# * remove empty lines throughout
|
|
|
|
# * remove white space at end of buffer
|
2010-05-19 13:36:27 +00:00
|
|
|
|
|
|
|
# With pdwtags 1.8, --verbose output includes separators like these:
|
|
|
|
# /* 93 */
|
|
|
|
# /* <0> (null):0 */
|
2011-07-14 16:18:40 +00:00
|
|
|
# with the second line omitted for intrinsic types.
|
|
|
|
# Whereas with pdwtags 1.3, they look like this:
|
2010-05-19 13:36:27 +00:00
|
|
|
# /* <2d2> /usr/include/libio.h:180 */
|
2011-07-14 16:18:40 +00:00
|
|
|
# The alternation of the following regexps matches both cases.
|
|
|
|
r1 = /\* \d+ \*/
|
2010-05-19 13:36:27 +00:00
|
|
|
r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/
|
2011-11-24 13:16:36 +00:00
|
|
|
struct_prefix = (remote_|qemu_|virNet|keepalive_)
|
2010-05-19 13:36:27 +00:00
|
|
|
|
2011-07-13 15:35:03 +00:00
|
|
|
PDWTAGS = \
|
2010-05-10 20:17:10 +00:00
|
|
|
$(AM_V_GEN)if (pdwtags --help) > /dev/null 2>&1; then \
|
2012-01-06 23:07:34 +00:00
|
|
|
pdwtags --verbose $(<:.lo=.$(OBJEXT)) > $(@F)-t1 2> $(@F)-t2; \
|
|
|
|
if test -s $(@F)-t2; then \
|
|
|
|
rm -rf $(@F)-t?; \
|
|
|
|
echo 'WARNING: pdwtags appears broken; skipping the $@ test' >&2;\
|
|
|
|
else \
|
2012-05-29 21:57:31 +00:00
|
|
|
$(PERL) -0777 -n \
|
2011-07-14 16:18:40 +00:00
|
|
|
-e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \
|
2011-11-24 13:16:36 +00:00
|
|
|
-e ' if ($$p =~ /^(struct|enum) $(struct_prefix)/ ||' \
|
|
|
|
-e ' $$p =~ /^enum {/) {' \
|
2010-05-19 13:36:27 +00:00
|
|
|
-e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \
|
|
|
|
-e ' $$p =~ s!\s+\n!\n!sg;' \
|
|
|
|
-e ' $$p =~ s!\s+$$!!;' \
|
2011-03-10 22:28:28 +00:00
|
|
|
-e ' $$p =~ s!\t! !g;' \
|
2010-05-19 13:36:27 +00:00
|
|
|
-e ' print "$$p\n";' \
|
|
|
|
-e ' $$n++;' \
|
|
|
|
-e ' }' \
|
|
|
|
-e '}' \
|
2011-03-10 22:28:28 +00:00
|
|
|
-e 'BEGIN {' \
|
|
|
|
-e ' print "/* -*- c -*- */\n";' \
|
|
|
|
-e '}' \
|
2010-05-19 13:36:27 +00:00
|
|
|
-e 'END {' \
|
2011-11-24 13:16:36 +00:00
|
|
|
-e ' if ($$n < 1) {' \
|
2010-05-19 13:36:27 +00:00
|
|
|
-e ' warn "WARNING: your pdwtags program is too old\n";' \
|
|
|
|
-e ' warn "WARNING: skipping the $@ test\n";' \
|
|
|
|
-e ' warn "WARNING: install dwarves-1.3 or newer\n";' \
|
|
|
|
-e ' exit 8;' \
|
|
|
|
-e ' }' \
|
|
|
|
-e '}' \
|
2012-01-06 23:07:34 +00:00
|
|
|
< $(@F)-t1 > $(@F)-t3; \
|
|
|
|
case $$? in 8) rm -f $(@F)-t?; exit 0;; 0) ;; *) exit 1;; esac;\
|
2012-06-13 03:49:22 +00:00
|
|
|
diff -u $(@)s $(@F)-t3; st=$$?; rm -f $(@F)-t?; exit $$st; \
|
2012-01-06 23:07:34 +00:00
|
|
|
fi; \
|
2010-05-07 14:01:26 +00:00
|
|
|
else \
|
2010-05-19 13:36:27 +00:00
|
|
|
echo 'WARNING: you lack pdwtags; skipping the $@ test' >&2; \
|
|
|
|
echo 'WARNING: install the dwarves package to get pdwtags' >&2; \
|
2010-05-07 14:01:26 +00:00
|
|
|
fi
|
2011-07-13 15:35:03 +00:00
|
|
|
|
2012-07-31 10:03:24 +00:00
|
|
|
check-symfile: libvirt.syms $(builddir)/.libs/libvirt.la
|
|
|
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms $(builddir)/.libs/libvirt.so
|
2012-07-24 13:37:48 +00:00
|
|
|
|
2011-07-13 15:35:03 +00:00
|
|
|
PROTOCOL_STRUCTS = \
|
|
|
|
$(srcdir)/remote_protocol-structs \
|
|
|
|
$(srcdir)/qemu_protocol-structs \
|
2011-09-22 10:51:55 +00:00
|
|
|
$(srcdir)/virnetprotocol-structs \
|
|
|
|
$(srcdir)/virkeepaliveprotocol-structs
|
2011-07-13 15:35:03 +00:00
|
|
|
if WITH_REMOTE
|
2012-06-13 03:49:22 +00:00
|
|
|
check-protocol: $(PROTOCOL_STRUCTS) $(PROTOCOL_STRUCTS:structs=struct)
|
|
|
|
|
2011-07-13 15:35:03 +00:00
|
|
|
# The .o file that pdwtags parses is created as a side effect of running
|
|
|
|
# libtool; but from make's perspective we depend on the .lo file.
|
2012-06-13 03:49:22 +00:00
|
|
|
$(srcdir)/remote_protocol-struct $(srcdir)/qemu_protocol-struct: \
|
|
|
|
$(srcdir)/%-struct: libvirt_driver_remote_la-%.lo
|
2011-07-13 15:35:03 +00:00
|
|
|
$(PDWTAGS)
|
2012-06-13 03:49:22 +00:00
|
|
|
$(srcdir)/virnetprotocol-struct $(srcdir)/virkeepaliveprotocol-struct: \
|
|
|
|
$(srcdir)/%-struct: libvirt_net_rpc_la-%.lo
|
2011-11-24 13:16:36 +00:00
|
|
|
$(PDWTAGS)
|
2011-05-11 20:26:06 +00:00
|
|
|
else !WITH_REMOTE
|
2012-06-13 03:49:22 +00:00
|
|
|
# The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be
|
|
|
|
# re-generated when configured --without-remote.
|
|
|
|
check-protocol:
|
2011-05-11 20:26:06 +00:00
|
|
|
endif
|
2011-07-08 16:54:02 +00:00
|
|
|
EXTRA_DIST += $(PROTOCOL_STRUCTS)
|
2012-07-24 13:37:48 +00:00
|
|
|
check-local: check-protocol check-symfile
|
2012-06-13 03:49:22 +00:00
|
|
|
.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
|
2010-05-07 14:01:26 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# Mock driver, covering domains, storage, networks, etc
|
|
|
|
TEST_DRIVER_SOURCES = \
|
2009-09-15 17:38:50 +00:00
|
|
|
test/test_driver.c test/test_driver.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
# Now the Hypervisor specific drivers
|
|
|
|
XEN_DRIVER_SOURCES = \
|
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.h, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h, src/xs_internal.c,
src/xs_internal.h: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 15:38:33 +00:00
|
|
|
xen/block_stats.c xen/block_stats.h \
|
|
|
|
xen/xen_hypervisor.c xen/xen_hypervisor.h \
|
|
|
|
xen/xen_driver.c xen/xen_driver.h \
|
|
|
|
xen/xend_internal.c xen/xend_internal.h \
|
|
|
|
xen/xm_internal.c xen/xm_internal.h \
|
|
|
|
xen/xs_internal.c xen/xs_internal.h
|
2008-11-25 10:44:52 +00:00
|
|
|
if WITH_XEN_INOTIFY
|
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.h, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h, src/xs_internal.c,
src/xs_internal.h: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 15:38:33 +00:00
|
|
|
XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
|
2008-11-25 10:44:52 +00:00
|
|
|
endif
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2012-07-17 14:54:08 +00:00
|
|
|
LXC_PROTOCOL_GENERATED = \
|
|
|
|
$(srcdir)/lxc/lxc_protocol.h \
|
|
|
|
$(srcdir)/lxc/lxc_protocol.c \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
LXC_MONITOR_GENERATED = \
|
|
|
|
$(srcdir)/lxc/lxc_monitor_dispatch.h \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
LXC_CONTROLLER_GENERATED = \
|
|
|
|
$(srcdir)/lxc/lxc_controller_dispatch.h \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
LXC_GENERATED = \
|
|
|
|
$(LXC_PROTOCOL_GENERATED) \
|
|
|
|
$(LXC_MONITOR_GENERATED) \
|
|
|
|
$(LXC_CONTROLLER_GENERATED) \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
LXC_PROTOCOL = $(srcdir)/lxc/lxc_protocol.x
|
|
|
|
|
|
|
|
$(srcdir)/lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
|
|
|
|
$(LXC_PROTOCOL)
|
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
|
|
|
|
-k virLXCProtocol VIR_LXC_PROTOCOL $(LXC_PROTOCOL) > $@
|
|
|
|
|
|
|
|
$(srcdir)/lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
|
|
|
|
$(REMOTE_PROTOCOL)
|
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
|
|
|
|
-b virLXCProtocol VIR_LXC_PROTOCOL $(LXC_PROTOCOL) > $@
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
$(LXC_PROTOCOL) \
|
|
|
|
$(LXC_GENERATED) \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
BUILT_SOURCES += $(LXC_GENERATED)
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
LXC_DRIVER_SOURCES = \
|
2012-07-17 14:54:08 +00:00
|
|
|
$(LXC_PROTOCOL_GENERATED) \
|
|
|
|
$(LXC_MONITOR_GENERATED) \
|
2009-09-15 16:03:01 +00:00
|
|
|
lxc/lxc_conf.c lxc/lxc_conf.h \
|
|
|
|
lxc/lxc_container.c lxc/lxc_container.h \
|
2012-07-13 11:21:27 +00:00
|
|
|
lxc/lxc_cgroup.c lxc/lxc_cgroup.h \
|
2012-07-13 10:16:23 +00:00
|
|
|
lxc/lxc_domain.c lxc/lxc_domain.h \
|
2012-07-17 11:14:35 +00:00
|
|
|
lxc/lxc_monitor.c lxc/lxc_monitor.h \
|
2012-07-13 11:39:29 +00:00
|
|
|
lxc/lxc_process.c lxc/lxc_process.h \
|
2011-11-02 16:03:09 +00:00
|
|
|
lxc/lxc_driver.c lxc/lxc_driver.h
|
2005-11-10 16:12:31 +00:00
|
|
|
|
2008-08-20 20:55:32 +00:00
|
|
|
LXC_CONTROLLER_SOURCES = \
|
2012-07-17 14:54:08 +00:00
|
|
|
$(LXC_PROTOCOL_GENERATED) \
|
|
|
|
$(LXC_CONTROLLER_GENERATED) \
|
2009-09-15 16:03:01 +00:00
|
|
|
lxc/lxc_conf.c lxc/lxc_conf.h \
|
|
|
|
lxc/lxc_container.c lxc/lxc_container.h \
|
2012-07-13 11:21:27 +00:00
|
|
|
lxc/lxc_cgroup.c lxc/lxc_cgroup.h \
|
2011-11-02 16:03:09 +00:00
|
|
|
lxc/lxc_controller.c
|
2008-08-20 20:55:32 +00:00
|
|
|
|
2009-10-08 14:34:22 +00:00
|
|
|
SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
|
|
|
|
security/virt-aa-helper.c
|
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
PHYP_DRIVER_SOURCES = \
|
|
|
|
phyp/phyp_driver.c phyp/phyp_driver.h
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
OPENVZ_DRIVER_SOURCES = \
|
2009-09-15 16:32:56 +00:00
|
|
|
openvz/openvz_conf.c openvz/openvz_conf.h \
|
2012-05-07 21:00:28 +00:00
|
|
|
openvz/openvz_driver.c openvz/openvz_driver.h \
|
|
|
|
openvz/openvz_util.c openvz/openvz_util.h
|
2007-06-15 01:21:18 +00:00
|
|
|
|
2010-12-21 15:58:03 +00:00
|
|
|
VMWARE_DRIVER_SOURCES = \
|
2010-12-20 06:01:46 +00:00
|
|
|
vmware/vmware_driver.c vmware/vmware_driver.h \
|
2010-12-17 10:28:20 +00:00
|
|
|
vmware/vmware_conf.c vmware/vmware_conf.h
|
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
VBOX_DRIVER_SOURCES = \
|
2011-06-29 04:06:48 +00:00
|
|
|
vbox/vbox_glue.c vbox/vbox_glue.h \
|
|
|
|
vbox/vbox_driver.c vbox/vbox_driver.h \
|
|
|
|
vbox/vbox_V2_2.c vbox/vbox_CAPI_v2_2.h \
|
|
|
|
vbox/vbox_V3_0.c vbox/vbox_CAPI_v3_0.h \
|
|
|
|
vbox/vbox_V3_1.c vbox/vbox_CAPI_v3_1.h \
|
|
|
|
vbox/vbox_V3_2.c vbox/vbox_CAPI_v3_2.h \
|
2011-10-29 19:26:57 +00:00
|
|
|
vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h \
|
|
|
|
vbox/vbox_V4_1.c vbox/vbox_CAPI_v4_1.h
|
2009-04-17 16:09:07 +00:00
|
|
|
|
2010-12-21 15:58:03 +00:00
|
|
|
VBOX_DRIVER_EXTRA_DIST = \
|
2010-12-14 22:07:57 +00:00
|
|
|
vbox/vbox_tmpl.c vbox/README \
|
|
|
|
vbox/vbox_MSCOMGlue.c vbox/vbox_MSCOMGlue.h \
|
|
|
|
vbox/vbox_XPCOMCGlue.c vbox/vbox_XPCOMCGlue.h
|
2009-04-19 16:36:22 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
QEMU_DRIVER_SOURCES = \
|
2011-10-05 17:31:54 +00:00
|
|
|
qemu/qemu_agent.c qemu/qemu_agent.h \
|
2010-12-16 15:07:07 +00:00
|
|
|
qemu/qemu_capabilities.c qemu/qemu_capabilities.h\
|
2010-12-16 15:07:07 +00:00
|
|
|
qemu/qemu_command.c qemu/qemu_command.h \
|
2010-12-16 15:23:41 +00:00
|
|
|
qemu/qemu_domain.c qemu/qemu_domain.h \
|
2010-12-17 18:55:00 +00:00
|
|
|
qemu/qemu_cgroup.c qemu/qemu_cgroup.h \
|
2010-12-16 16:10:54 +00:00
|
|
|
qemu/qemu_hostdev.c qemu/qemu_hostdev.h \
|
2010-12-16 16:10:54 +00:00
|
|
|
qemu/qemu_hotplug.c qemu/qemu_hotplug.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
qemu/qemu_conf.c qemu/qemu_conf.h \
|
2011-01-31 10:47:03 +00:00
|
|
|
qemu/qemu_process.c qemu/qemu_process.h \
|
|
|
|
qemu/qemu_migration.c qemu/qemu_migration.h \
|
2009-10-09 18:07:55 +00:00
|
|
|
qemu/qemu_monitor.c qemu/qemu_monitor.h \
|
2009-09-22 17:48:40 +00:00
|
|
|
qemu/qemu_monitor_text.c \
|
|
|
|
qemu/qemu_monitor_text.h \
|
2009-11-03 18:59:18 +00:00
|
|
|
qemu/qemu_monitor_json.c \
|
|
|
|
qemu/qemu_monitor_json.h \
|
|
|
|
qemu/qemu_driver.c qemu/qemu_driver.h \
|
2010-05-07 17:11:02 +00:00
|
|
|
qemu/qemu_bridge_filter.c \
|
Refactor the security drivers to simplify usage
The current security driver usage requires horrible code like
if (driver->securityDriver &&
driver->securityDriver->domainSetSecurityHostdevLabel &&
driver->securityDriver->domainSetSecurityHostdevLabel(driver->securityDriver,
vm, hostdev) < 0)
This pair of checks for NULL clutters up the code, making the driver
calls 2 lines longer than they really need to be. The goal of the
patchset is to change the calling convention to simply
if (virSecurityManagerSetHostdevLabel(driver->securityDriver,
vm, hostdev) < 0)
The first check for 'driver->securityDriver' being NULL is removed
by introducing a 'no op' security driver that will always be present
if no real driver is enabled. This guarentees driver->securityDriver
!= NULL.
The second check for 'driver->securityDriver->domainSetSecurityHostdevLabel'
being non-NULL is hidden in a new abstraction called virSecurityManager.
This separates the driver callbacks, from main internal API. The addition
of a virSecurityManager object, that is separate from the virSecurityDriver
struct also allows for security drivers to carry state / configuration
information directly. Thus the DAC/Stack drivers from src/qemu which
used to pull config from 'struct qemud_driver' can now be moved into
the 'src/security' directory and store their config directly.
* src/qemu/qemu_conf.h, src/qemu/qemu_driver.c: Update to
use new virSecurityManager APIs
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_dac.h
src/qemu/qemu_security_stacked.c, src/qemu/qemu_security_stacked.h:
Move into src/security directory
* src/security/security_stack.c, src/security/security_stack.h,
src/security/security_dac.c, src/security/security_dac.h: Generic
versions of previous QEMU specific drivers
* src/security/security_apparmor.c, src/security/security_apparmor.h,
src/security/security_driver.c, src/security/security_driver.h,
src/security/security_selinux.c, src/security/security_selinux.h:
Update to take virSecurityManagerPtr object as the first param
in all callbacks
* src/security/security_nop.c, src/security/security_nop.h: Stub
implementation of all security driver APIs.
* src/security/security_manager.h, src/security/security_manager.c:
New internal API for invoking security drivers
* src/libvirt.c: Add missing debug for security APIs
2010-11-17 20:26:30 +00:00
|
|
|
qemu/qemu_bridge_filter.h
|
2008-04-18 08:33:23 +00:00
|
|
|
|
2010-03-14 11:11:51 +00:00
|
|
|
XENAPI_DRIVER_SOURCES = \
|
|
|
|
xenapi/xenapi_driver.c xenapi/xenapi_driver.h \
|
2010-03-17 16:25:50 +00:00
|
|
|
xenapi/xenapi_driver_private.h \
|
2010-03-14 11:11:51 +00:00
|
|
|
xenapi/xenapi_utils.c xenapi/xenapi_utils.h
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
LIBXL_DRIVER_SOURCES = \
|
|
|
|
libxl/libxl_conf.c libxl/libxl_conf.h \
|
|
|
|
libxl/libxl_driver.c libxl/libxl_driver.h
|
|
|
|
|
2008-11-19 16:58:23 +00:00
|
|
|
UML_DRIVER_SOURCES = \
|
2009-09-15 16:25:30 +00:00
|
|
|
uml/uml_conf.c uml/uml_conf.h \
|
|
|
|
uml/uml_driver.c uml/uml_driver.h
|
2008-11-19 16:58:23 +00:00
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
ESX_DRIVER_SOURCES = \
|
2010-01-15 15:01:02 +00:00
|
|
|
esx/esx_private.h \
|
2009-07-24 14:17:06 +00:00
|
|
|
esx/esx_driver.c esx/esx_driver.h \
|
2010-01-15 15:01:02 +00:00
|
|
|
esx/esx_interface_driver.c esx/esx_interface_driver.h \
|
|
|
|
esx/esx_network_driver.c esx/esx_network_driver.h \
|
|
|
|
esx/esx_storage_driver.c esx/esx_storage_driver.h \
|
|
|
|
esx/esx_device_monitor.c esx/esx_device_monitor.h \
|
|
|
|
esx/esx_secret_driver.c esx/esx_secret_driver.h \
|
2010-04-14 23:38:50 +00:00
|
|
|
esx/esx_nwfilter_driver.c esx/esx_nwfilter_driver.h \
|
2009-07-24 14:17:06 +00:00
|
|
|
esx/esx_util.c esx/esx_util.h \
|
|
|
|
esx/esx_vi.c esx/esx_vi.h \
|
2009-07-23 20:21:08 +00:00
|
|
|
esx/esx_vi_methods.c esx/esx_vi_methods.h \
|
2010-12-21 21:39:55 +00:00
|
|
|
esx/esx_vi_types.c esx/esx_vi_types.h
|
2009-07-23 20:21:08 +00:00
|
|
|
|
2010-03-06 16:56:28 +00:00
|
|
|
ESX_DRIVER_GENERATED = \
|
2010-04-26 14:59:50 +00:00
|
|
|
esx/esx_vi_methods.generated.c \
|
|
|
|
esx/esx_vi_methods.generated.h \
|
2011-05-01 06:05:58 +00:00
|
|
|
esx/esx_vi_methods.generated.macro \
|
2010-03-06 16:56:28 +00:00
|
|
|
esx/esx_vi_types.generated.c \
|
|
|
|
esx/esx_vi_types.generated.h \
|
|
|
|
esx/esx_vi_types.generated.typedef \
|
|
|
|
esx/esx_vi_types.generated.typeenum \
|
|
|
|
esx/esx_vi_types.generated.typetostring \
|
2011-04-15 03:00:35 +00:00
|
|
|
esx/esx_vi_types.generated.typefromstring \
|
|
|
|
esx/esx_vi.generated.c \
|
|
|
|
esx/esx_vi.generated.h
|
2010-03-06 16:56:28 +00:00
|
|
|
|
|
|
|
ESX_DRIVER_EXTRA_DIST = \
|
|
|
|
esx/README \
|
|
|
|
esx/esx_vi_generator.input \
|
|
|
|
esx/esx_vi_generator.py \
|
|
|
|
$(ESX_DRIVER_GENERATED)
|
|
|
|
|
2011-07-13 14:47:01 +00:00
|
|
|
HYPERV_DRIVER_SOURCES = \
|
|
|
|
hyperv/hyperv_private.h \
|
|
|
|
hyperv/hyperv_driver.c hyperv/hyperv_driver.h \
|
|
|
|
hyperv/hyperv_interface_driver.c hyperv/hyperv_interface_driver.h \
|
|
|
|
hyperv/hyperv_network_driver.c hyperv/hyperv_network_driver.h \
|
|
|
|
hyperv/hyperv_storage_driver.c hyperv/hyperv_storage_driver.h \
|
|
|
|
hyperv/hyperv_device_monitor.c hyperv/hyperv_device_monitor.h \
|
|
|
|
hyperv/hyperv_secret_driver.c hyperv/hyperv_secret_driver.h \
|
2011-07-13 15:05:19 +00:00
|
|
|
hyperv/hyperv_nwfilter_driver.c hyperv/hyperv_nwfilter_driver.h \
|
2011-07-13 15:16:47 +00:00
|
|
|
hyperv/hyperv_util.c hyperv/hyperv_util.h \
|
2011-07-13 15:05:19 +00:00
|
|
|
hyperv/hyperv_wmi.c hyperv/hyperv_wmi.h \
|
|
|
|
hyperv/hyperv_wmi_classes.c hyperv/hyperv_wmi_classes.h \
|
|
|
|
hyperv/openwsman.h
|
|
|
|
|
|
|
|
HYPERV_DRIVER_GENERATED = \
|
|
|
|
hyperv/hyperv_wmi.generated.c \
|
|
|
|
hyperv/hyperv_wmi.generated.h \
|
|
|
|
hyperv/hyperv_wmi_classes.generated.c \
|
|
|
|
hyperv/hyperv_wmi_classes.generated.h \
|
|
|
|
hyperv/hyperv_wmi_classes.generated.typedef
|
|
|
|
|
|
|
|
HYPERV_DRIVER_EXTRA_DIST = \
|
|
|
|
hyperv/hyperv_wmi_generator.input \
|
|
|
|
hyperv/hyperv_wmi_generator.py \
|
|
|
|
$(HYPERV_DRIVER_GENERATED)
|
|
|
|
|
2012-07-31 18:56:05 +00:00
|
|
|
PARALLELS_DRIVER_SOURCES = \
|
|
|
|
parallels/parallels_driver.h \
|
2012-07-31 18:56:07 +00:00
|
|
|
parallels/parallels_driver.c \
|
2012-08-01 06:12:09 +00:00
|
|
|
parallels/parallels_utils.c \
|
|
|
|
parallels/parallels_utils.h \
|
2012-08-01 03:46:22 +00:00
|
|
|
parallels/parallels_storage.c
|
2012-07-31 18:56:05 +00:00
|
|
|
|
2008-10-10 13:57:13 +00:00
|
|
|
NETWORK_DRIVER_SOURCES = \
|
2009-09-15 17:52:58 +00:00
|
|
|
network/bridge_driver.h network/bridge_driver.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-07-21 14:02:16 +00:00
|
|
|
INTERFACE_DRIVER_SOURCES = \
|
2009-09-15 17:55:16 +00:00
|
|
|
interface/netcf_driver.h interface/netcf_driver.c
|
2009-07-21 14:02:16 +00:00
|
|
|
|
2009-08-14 19:48:55 +00:00
|
|
|
SECRET_DRIVER_SOURCES = \
|
2009-09-15 17:59:58 +00:00
|
|
|
secret/secret_driver.h secret/secret_driver.c
|
2009-08-14 19:48:55 +00:00
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
# Storage backend specific impls
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_driver.h storage/storage_driver.c \
|
|
|
|
storage/storage_backend.h storage/storage_backend.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
STORAGE_DRIVER_FS_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_fs.h storage/storage_backend_fs.c
|
2008-04-18 08:33:23 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_LVM_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_logical.h \
|
|
|
|
storage/storage_backend_logical.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
STORAGE_DRIVER_ISCSI_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_iscsi.h storage/storage_backend_iscsi.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-04-01 16:03:22 +00:00
|
|
|
STORAGE_DRIVER_SCSI_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_scsi.h storage/storage_backend_scsi.c
|
2009-04-01 16:03:22 +00:00
|
|
|
|
2009-09-08 13:47:45 +00:00
|
|
|
STORAGE_DRIVER_MPATH_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_mpath.h storage/storage_backend_mpath.c
|
2009-09-08 13:47:45 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_DISK_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_disk.h storage/storage_backend_disk.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2012-05-14 09:06:42 +00:00
|
|
|
STORAGE_DRIVER_RBD_SOURCES = \
|
|
|
|
storage/storage_backend_rbd.h storage/storage_backend_rbd.c
|
|
|
|
|
2012-07-18 19:06:58 +00:00
|
|
|
STORAGE_DRIVER_SHEEPDOG_SOURCES = \
|
|
|
|
storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_HELPER_DISK_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/parthelper.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2011-02-22 12:05:20 +00:00
|
|
|
UTIL_IO_HELPER_SOURCES = \
|
|
|
|
util/iohelper.c
|
|
|
|
|
2010-03-25 17:46:09 +00:00
|
|
|
# Network filters
|
|
|
|
NWFILTER_DRIVER_SOURCES = \
|
|
|
|
nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \
|
2010-03-31 08:19:06 +00:00
|
|
|
nwfilter/nwfilter_gentech_driver.c \
|
|
|
|
nwfilter/nwfilter_gentech_driver.h \
|
2012-06-01 23:32:06 +00:00
|
|
|
nwfilter/nwfilter_dhcpsnoop.c \
|
|
|
|
nwfilter/nwfilter_dhcpsnoop.h \
|
2010-03-31 08:19:06 +00:00
|
|
|
nwfilter/nwfilter_ebiptables_driver.c \
|
nwfilter: Support for learning a VM's IP address
This patch implements support for learning a VM's IP address. It uses
the pcap library to listen on the VM's backend network interface (tap)
or the physical ethernet device (macvtap) and tries to capture packets
with source or destination MAC address of the VM and learn from DHCP
Offers, ARP traffic, or first-sent IPv4 packet what the IP address of
the VM's interface is. This then allows to instantiate the network
traffic filtering rules without the user having to provide the IP
parameter somewhere in the filter description or in the interface
description as a parameter. This only supports to detect the parameter
IP, which is for the assumed single IPv4 address of a VM. There is not
support for interfaces that may have multiple IP addresses (IP
aliasing) or IPv6 that may then require more than one valid IP address
to be detected. A VM can have multiple independent interfaces that each
uses a different IP address and in that case it will be attempted to
detect each one of the address independently.
So, when for example an interface description in the domain XML has
looked like this up to now:
<interface type='bridge'>
<source bridge='mybridge'/>
<model type='virtio'/>
<filterref filter='clean-traffic'>
<parameter name='IP' value='10.2.3.4'/>
</filterref>
</interface>
you may omit the IP parameter:
<interface type='bridge'>
<source bridge='mybridge'/>
<model type='virtio'/>
<filterref filter='clean-traffic'/>
</interface>
Internally I am walking the 'tree' of a VM's referenced network filters
and determine with the given variables which variables are missing. Now,
the above IP parameter may be missing and this causes a libvirt-internal
thread to be started that uses the pcap library's API to listen to the
backend interface (in case of macvtap to the physical interface) in an
attempt to determine the missing IP parameter. If the backend interface
disappears the thread terminates assuming the VM was brought down. In
case of a macvtap device a timeout is being used to wait for packets
from the given VM (filtering by VM's interface MAC address). If the VM's
macvtap device disappeared the thread also terminates. In all other
cases it tries to determine the IP address of the VM and will then apply
the rules late on the given interface, which would have happened
immediately if the IP parameter had been explicitly given. In case an
error happens while the firewall rules are applied, the VM's backend
interface is 'down'ed preventing it to communicate. Reasons for failure
for applying the network firewall rules may that an ebtables/iptables
command failes or OOM errors. Essentially the same failure reasons may
occur as when the firewall rules are applied immediately on VM start,
except that due to the late application of the filtering rules the VM
now is already running and cannot be hindered anymore from starting.
Bringing down the whole VM would probably be considered too drastic.
While a VM's IP address is attempted to be determined only limited
updates to network filters are allowed. In particular it is prevented
that filters are modified in such a way that they would introduce new
variables.
A caveat: The algorithm does not know which one is the appropriate IP
address of a VM. If the VM spoofs an IP address in its first ARP traffic
or IPv4 packets its filtering rules will be instantiated for this IP
address, thus 'locking' it to the found IP address. So, it's still
'safer' to explicitly provide the IP address of a VM's interface in the
filter description if it is known beforehand.
* configure.ac: detect libpcap
* libvirt.spec.in: require libpcap[-devel] if qemu is built
* src/internal.h: add the new ATTRIBUTE_PACKED define
* src/Makefile.am src/libvirt_private.syms: add the new modules and symbols
* src/nwfilter/nwfilter_learnipaddr.[ch]: new module being added
* src/nwfilter/nwfilter_driver.c src/conf/nwfilter_conf.[ch]
src/nwfilter/nwfilter_ebiptables_driver.[ch]
src/nwfilter/nwfilter_gentech_driver.[ch]: plu the new functionality in
* tests/nwfilterxml2xmltest: extend testing
2010-04-07 21:02:18 +00:00
|
|
|
nwfilter/nwfilter_ebiptables_driver.h \
|
|
|
|
nwfilter/nwfilter_learnipaddr.c \
|
|
|
|
nwfilter/nwfilter_learnipaddr.h
|
2010-03-31 08:19:06 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
# Security framework and drivers for various models
|
2009-07-24 14:17:06 +00:00
|
|
|
SECURITY_DRIVER_SOURCES = \
|
Refactor the security drivers to simplify usage
The current security driver usage requires horrible code like
if (driver->securityDriver &&
driver->securityDriver->domainSetSecurityHostdevLabel &&
driver->securityDriver->domainSetSecurityHostdevLabel(driver->securityDriver,
vm, hostdev) < 0)
This pair of checks for NULL clutters up the code, making the driver
calls 2 lines longer than they really need to be. The goal of the
patchset is to change the calling convention to simply
if (virSecurityManagerSetHostdevLabel(driver->securityDriver,
vm, hostdev) < 0)
The first check for 'driver->securityDriver' being NULL is removed
by introducing a 'no op' security driver that will always be present
if no real driver is enabled. This guarentees driver->securityDriver
!= NULL.
The second check for 'driver->securityDriver->domainSetSecurityHostdevLabel'
being non-NULL is hidden in a new abstraction called virSecurityManager.
This separates the driver callbacks, from main internal API. The addition
of a virSecurityManager object, that is separate from the virSecurityDriver
struct also allows for security drivers to carry state / configuration
information directly. Thus the DAC/Stack drivers from src/qemu which
used to pull config from 'struct qemud_driver' can now be moved into
the 'src/security' directory and store their config directly.
* src/qemu/qemu_conf.h, src/qemu/qemu_driver.c: Update to
use new virSecurityManager APIs
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_dac.h
src/qemu/qemu_security_stacked.c, src/qemu/qemu_security_stacked.h:
Move into src/security directory
* src/security/security_stack.c, src/security/security_stack.h,
src/security/security_dac.c, src/security/security_dac.h: Generic
versions of previous QEMU specific drivers
* src/security/security_apparmor.c, src/security/security_apparmor.h,
src/security/security_driver.c, src/security/security_driver.h,
src/security/security_selinux.c, src/security/security_selinux.h:
Update to take virSecurityManagerPtr object as the first param
in all callbacks
* src/security/security_nop.c, src/security/security_nop.h: Stub
implementation of all security driver APIs.
* src/security/security_manager.h, src/security/security_manager.c:
New internal API for invoking security drivers
* src/libvirt.c: Add missing debug for security APIs
2010-11-17 20:26:30 +00:00
|
|
|
security/security_driver.h security/security_driver.c \
|
|
|
|
security/security_nop.h security/security_nop.c \
|
|
|
|
security/security_stack.h security/security_stack.c \
|
|
|
|
security/security_dac.h security/security_dac.c \
|
|
|
|
security/security_manager.h security/security_manager.c
|
2009-03-03 09:44:41 +00:00
|
|
|
|
2009-03-03 10:06:49 +00:00
|
|
|
SECURITY_DRIVER_SELINUX_SOURCES = \
|
2009-09-15 18:06:37 +00:00
|
|
|
security/security_selinux.h security/security_selinux.c
|
2009-03-03 10:06:49 +00:00
|
|
|
|
2009-10-08 14:34:22 +00:00
|
|
|
SECURITY_DRIVER_APPARMOR_SOURCES = \
|
|
|
|
security/security_apparmor.h security/security_apparmor.c
|
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
NODE_DEVICE_DRIVER_SOURCES = \
|
2009-11-12 21:48:24 +00:00
|
|
|
node_device/node_device_driver.c \
|
|
|
|
node_device/node_device_driver.h \
|
|
|
|
node_device/node_device_linux_sysfs.c
|
2008-11-21 12:27:11 +00:00
|
|
|
|
|
|
|
NODE_DEVICE_DRIVER_HAL_SOURCES = \
|
2009-09-15 17:30:17 +00:00
|
|
|
node_device/node_device_hal.c \
|
2009-11-12 21:48:24 +00:00
|
|
|
node_device/node_device_hal.h
|
2009-06-02 15:12:53 +00:00
|
|
|
|
2009-11-12 21:48:24 +00:00
|
|
|
NODE_DEVICE_DRIVER_UDEV_SOURCES = \
|
2009-11-20 18:43:59 +00:00
|
|
|
node_device/node_device_udev.c \
|
|
|
|
node_device/node_device_udev.h
|
2009-11-12 21:48:24 +00:00
|
|
|
|
Adds CPU selection infrastructure
Each driver supporting CPU selection must fill in host CPU capabilities.
When filling them, drivers for hypervisors running on the same node as
libvirtd can use cpuNodeData() to obtain raw CPU data. Other drivers,
such as VMware, need to implement their own way of getting such data.
Raw data can be decoded into virCPUDefPtr using cpuDecode() function.
When implementing virConnectCompareCPU(), a hypervisor driver can just
call cpuCompareXML() function with host CPU capabilities.
For each guest for which a driver supports selecting CPU models, it must
set the appropriate feature in guest's capabilities:
virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)
Actions needed when a domain is being created depend on whether the
hypervisor understands raw CPU data (currently CPUID for i686, x86_64
architectures) or symbolic names has to be used.
Typical use by hypervisors which prefer CPUID (such as VMware and Xen):
- convert guest CPU configuration from domain's XML into a set of raw
data structures each representing one of the feature policies:
cpuEncode(conn, architecture, guest_cpu_config,
&forced_data, &required_data, &optional_data,
&disabled_data, &forbidden_data)
- create a mask or whatever the hypervisor expects to see and pass it
to the hypervisor
Typical use by hypervisors with symbolic model names (such as QEMU):
- get raw CPU data for a computed guest CPU:
cpuGuestData(conn, host_cpu, guest_cpu_config, &data)
- decode raw data into virCPUDefPtr with a possible restriction on
allowed model names:
cpuDecode(conn, guest, data, n_allowed_models, allowed_models)
- pass guest->model and guest->features to the hypervisor
* src/cpu/cpu.c src/cpu/cpu.h src/cpu/cpu_generic.c
src/cpu/cpu_generic.h src/cpu/cpu_map.c src/cpu/cpu_map.h
src/cpu/cpu_x86.c src/cpu/cpu_x86.h src/cpu/cpu_x86_data.h
* configure.in: check for CPUID instruction
* src/Makefile.am: glue the new files in
* src/libvirt_private.syms: add new private symbols
* po/POTFILES.in: add new cpu files containing translatable strings
2009-12-18 15:02:11 +00:00
|
|
|
CPU_SOURCES = \
|
|
|
|
cpu/cpu.h cpu/cpu.c \
|
|
|
|
cpu/cpu_generic.h cpu/cpu_generic.c \
|
|
|
|
cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \
|
2012-06-22 11:50:11 +00:00
|
|
|
cpu/cpu_s390.h cpu/cpu_s390.c \
|
2012-07-12 15:28:17 +00:00
|
|
|
cpu/cpu_arm.h cpu/cpu_arm.c \
|
2011-10-03 12:56:20 +00:00
|
|
|
cpu/cpu_map.h cpu/cpu_map.c cpu/cpu_powerpc.h \
|
|
|
|
cpu/cpu_powerpc.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2010-12-21 21:39:55 +00:00
|
|
|
VMX_SOURCES = \
|
|
|
|
vmx/vmx.c vmx/vmx.h
|
|
|
|
|
2011-02-21 13:40:08 +00:00
|
|
|
XENXS_SOURCES = \
|
|
|
|
xenxs/xenxs_private.h \
|
2011-02-21 13:40:10 +00:00
|
|
|
xenxs/xen_sxpr.c xenxs/xen_sxpr.h \
|
|
|
|
xenxs/xen_xm.c xenxs/xen_xm.h
|
2011-02-21 13:40:08 +00:00
|
|
|
|
2009-12-22 11:06:01 +00:00
|
|
|
pkgdata_DATA = cpu/cpu_map.xml
|
|
|
|
|
2010-05-07 17:11:02 +00:00
|
|
|
EXTRA_DIST += $(pkgdata_DATA)
|
2009-12-18 15:11:42 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
#########################
|
|
|
|
#
|
|
|
|
# Build up list of libvirt.la source files based on configure conditions
|
|
|
|
#
|
|
|
|
# First deal with sources usable in non-daemon context
|
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES = libvirt_util.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD)
|
|
|
|
libvirt_la_BUILT_LIBADD = libvirt_util.la
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_util_la_SOURCES = \
|
|
|
|
$(UTIL_SOURCES)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \
|
2012-04-19 14:34:35 +00:00
|
|
|
$(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \
|
|
|
|
$(DBUS_CFLAGS)
|
2010-09-15 13:44:11 +00:00
|
|
|
libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \
|
2011-11-29 12:11:01 +00:00
|
|
|
$(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \
|
2012-07-03 14:37:08 +00:00
|
|
|
$(RT_LIBS) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS)
|
2008-11-17 10:43:30 +00:00
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
|
|
|
|
noinst_LTLIBRARIES += libvirt_conf.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_conf.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_conf_la_SOURCES = $(CONF_SOURCES)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_conf_la_CFLAGS = $(AM_CFLAGS)
|
|
|
|
libvirt_conf_la_LDFLAGS = $(AM_LDFLAGS)
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
|
Adds CPU selection infrastructure
Each driver supporting CPU selection must fill in host CPU capabilities.
When filling them, drivers for hypervisors running on the same node as
libvirtd can use cpuNodeData() to obtain raw CPU data. Other drivers,
such as VMware, need to implement their own way of getting such data.
Raw data can be decoded into virCPUDefPtr using cpuDecode() function.
When implementing virConnectCompareCPU(), a hypervisor driver can just
call cpuCompareXML() function with host CPU capabilities.
For each guest for which a driver supports selecting CPU models, it must
set the appropriate feature in guest's capabilities:
virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)
Actions needed when a domain is being created depend on whether the
hypervisor understands raw CPU data (currently CPUID for i686, x86_64
architectures) or symbolic names has to be used.
Typical use by hypervisors which prefer CPUID (such as VMware and Xen):
- convert guest CPU configuration from domain's XML into a set of raw
data structures each representing one of the feature policies:
cpuEncode(conn, architecture, guest_cpu_config,
&forced_data, &required_data, &optional_data,
&disabled_data, &forbidden_data)
- create a mask or whatever the hypervisor expects to see and pass it
to the hypervisor
Typical use by hypervisors with symbolic model names (such as QEMU):
- get raw CPU data for a computed guest CPU:
cpuGuestData(conn, host_cpu, guest_cpu_config, &data)
- decode raw data into virCPUDefPtr with a possible restriction on
allowed model names:
cpuDecode(conn, guest, data, n_allowed_models, allowed_models)
- pass guest->model and guest->features to the hypervisor
* src/cpu/cpu.c src/cpu/cpu.h src/cpu/cpu_generic.c
src/cpu/cpu_generic.h src/cpu/cpu_map.c src/cpu/cpu_map.h
src/cpu/cpu_x86.c src/cpu/cpu_x86.h src/cpu/cpu_x86_data.h
* configure.in: check for CPUID instruction
* src/Makefile.am: glue the new files in
* src/libvirt_private.syms: add new private symbols
* po/POTFILES.in: add new cpu files containing translatable strings
2009-12-18 15:02:11 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_cpu.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_cpu.la
|
Adds CPU selection infrastructure
Each driver supporting CPU selection must fill in host CPU capabilities.
When filling them, drivers for hypervisors running on the same node as
libvirtd can use cpuNodeData() to obtain raw CPU data. Other drivers,
such as VMware, need to implement their own way of getting such data.
Raw data can be decoded into virCPUDefPtr using cpuDecode() function.
When implementing virConnectCompareCPU(), a hypervisor driver can just
call cpuCompareXML() function with host CPU capabilities.
For each guest for which a driver supports selecting CPU models, it must
set the appropriate feature in guest's capabilities:
virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)
Actions needed when a domain is being created depend on whether the
hypervisor understands raw CPU data (currently CPUID for i686, x86_64
architectures) or symbolic names has to be used.
Typical use by hypervisors which prefer CPUID (such as VMware and Xen):
- convert guest CPU configuration from domain's XML into a set of raw
data structures each representing one of the feature policies:
cpuEncode(conn, architecture, guest_cpu_config,
&forced_data, &required_data, &optional_data,
&disabled_data, &forbidden_data)
- create a mask or whatever the hypervisor expects to see and pass it
to the hypervisor
Typical use by hypervisors with symbolic model names (such as QEMU):
- get raw CPU data for a computed guest CPU:
cpuGuestData(conn, host_cpu, guest_cpu_config, &data)
- decode raw data into virCPUDefPtr with a possible restriction on
allowed model names:
cpuDecode(conn, guest, data, n_allowed_models, allowed_models)
- pass guest->model and guest->features to the hypervisor
* src/cpu/cpu.c src/cpu/cpu.h src/cpu/cpu_generic.c
src/cpu/cpu_generic.h src/cpu/cpu_map.c src/cpu/cpu_map.h
src/cpu/cpu_x86.c src/cpu/cpu_x86.h src/cpu/cpu_x86_data.h
* configure.in: check for CPUID instruction
* src/Makefile.am: glue the new files in
* src/libvirt_private.syms: add new private symbols
* po/POTFILES.in: add new cpu files containing translatable strings
2009-12-18 15:02:11 +00:00
|
|
|
libvirt_cpu_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
Adds CPU selection infrastructure
Each driver supporting CPU selection must fill in host CPU capabilities.
When filling them, drivers for hypervisors running on the same node as
libvirtd can use cpuNodeData() to obtain raw CPU data. Other drivers,
such as VMware, need to implement their own way of getting such data.
Raw data can be decoded into virCPUDefPtr using cpuDecode() function.
When implementing virConnectCompareCPU(), a hypervisor driver can just
call cpuCompareXML() function with host CPU capabilities.
For each guest for which a driver supports selecting CPU models, it must
set the appropriate feature in guest's capabilities:
virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)
Actions needed when a domain is being created depend on whether the
hypervisor understands raw CPU data (currently CPUID for i686, x86_64
architectures) or symbolic names has to be used.
Typical use by hypervisors which prefer CPUID (such as VMware and Xen):
- convert guest CPU configuration from domain's XML into a set of raw
data structures each representing one of the feature policies:
cpuEncode(conn, architecture, guest_cpu_config,
&forced_data, &required_data, &optional_data,
&disabled_data, &forbidden_data)
- create a mask or whatever the hypervisor expects to see and pass it
to the hypervisor
Typical use by hypervisors with symbolic model names (such as QEMU):
- get raw CPU data for a computed guest CPU:
cpuGuestData(conn, host_cpu, guest_cpu_config, &data)
- decode raw data into virCPUDefPtr with a possible restriction on
allowed model names:
cpuDecode(conn, guest, data, n_allowed_models, allowed_models)
- pass guest->model and guest->features to the hypervisor
* src/cpu/cpu.c src/cpu/cpu.h src/cpu/cpu_generic.c
src/cpu/cpu_generic.h src/cpu/cpu_map.c src/cpu/cpu_map.h
src/cpu/cpu_x86.c src/cpu/cpu_x86.h src/cpu/cpu_x86_data.h
* configure.in: check for CPUID instruction
* src/Makefile.am: glue the new files in
* src/libvirt_private.syms: add new private symbols
* po/POTFILES.in: add new cpu files containing translatable strings
2009-12-18 15:02:11 +00:00
|
|
|
libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
|
|
|
|
|
2010-12-21 21:39:55 +00:00
|
|
|
if WITH_VMX
|
|
|
|
noinst_LTLIBRARIES += libvirt_vmx.la
|
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_vmx.la
|
|
|
|
libvirt_vmx_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2010-12-21 21:39:55 +00:00
|
|
|
libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2011-03-29 12:39:18 +00:00
|
|
|
if WITH_XENXS
|
2011-02-21 13:40:08 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_xenxs.la
|
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_xenxs.la
|
|
|
|
libvirt_xenxs_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2011-02-21 13:40:08 +00:00
|
|
|
libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES)
|
|
|
|
endif
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
|
2008-11-21 12:20:45 +00:00
|
|
|
|
2010-06-22 13:20:23 +00:00
|
|
|
libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2011-06-09 19:47:43 +00:00
|
|
|
libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS)
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-01-06 15:16:43 +00:00
|
|
|
USED_SYM_FILES = libvirt_private.syms
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
if WITH_TEST
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_test.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_test_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
if WITH_REMOTE
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_remote.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_remote_la_CFLAGS = \
|
|
|
|
$(GNUTLS_CFLAGS) \
|
2011-07-29 19:16:29 +00:00
|
|
|
$(XDR_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf \
|
|
|
|
-I$(top_srcdir)/src/rpc \
|
2010-06-09 18:35:49 +00:00
|
|
|
$(AM_CFLAGS)
|
|
|
|
libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS)
|
2011-09-30 13:38:39 +00:00
|
|
|
libvirt_driver_remote_la_LIBADD = $(GNUTLS_LIBS) \
|
|
|
|
libvirt-net-rpc-client.la \
|
|
|
|
libvirt-net-rpc-server.la \
|
|
|
|
libvirt-net-rpc.la
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
|
2009-09-16 15:55:16 +00:00
|
|
|
|
2012-06-06 15:45:04 +00:00
|
|
|
BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED)
|
2010-04-17 02:09:25 +00:00
|
|
|
|
2011-05-11 20:26:06 +00:00
|
|
|
endif WITH_REMOTE
|
|
|
|
|
2011-06-24 13:37:25 +00:00
|
|
|
%protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl
|
2012-05-29 21:57:31 +00:00
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \
|
2011-05-06 23:10:43 +00:00
|
|
|
$< $@
|
2011-05-06 13:11:32 +00:00
|
|
|
|
2010-12-10 12:27:33 +00:00
|
|
|
%protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl
|
2012-05-29 21:57:31 +00:00
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \
|
2011-06-29 04:06:48 +00:00
|
|
|
$< $@
|
2009-09-16 15:55:16 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
if WITH_XEN
|
2012-05-25 19:18:10 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_xen_impl.la
|
|
|
|
libvirt_driver_xen_la_SOURCES =
|
|
|
|
libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_xen.la
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
|
libvirt_driver_xen_la_LDFLAGS = -module -avoid-version
|
2008-11-21 12:16:08 +00:00
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_xen.la
|
Only build server side drivers as modules
The driver modules all use symbols which are defined in libvirt.so.
Thus for loading of modules to work, the binary that libvirt.so
is linked to must export its symbols back to modules. If the
libvirt.so itself is dlopen()d then the RTLD_GLOBAL flag must
be set. Unfortunately few, if any, programming languages use
the RTLD_GLOBAL flag when loading modules :-( This means is it
not practical to use driver modules for any libvirt client side
drivers (OpenVZ, VMWare, Hyper-V, Remote client, test).
This patch changes the build process so only server side drivers
are built as modules (Xen, QEMU, LXC, UML)
* daemon/libvirtd.c: Add missing load of 'interface' driver
* src/Makefile.am: Only build server side drivers as modules
* src/libvirt.c: Don't load any driver modules
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2011-06-01 15:36:21 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2012-05-25 19:18:10 +00:00
|
|
|
|
|
|
|
libvirt_driver_xen_impl_la_CFLAGS = \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(XEN_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf \
|
|
|
|
-I$(top_srcdir)/src/xenxs \
|
2010-06-09 18:35:49 +00:00
|
|
|
$(AM_CFLAGS)
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
|
|
|
libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
|
|
|
|
libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
if WITH_PHYP
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_phyp.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_phyp_la_LIBADD = $(LIBSSH2_LIBS)
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_phyp_la_CFLAGS = $(LIBSSH2_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2009-07-24 14:17:06 +00:00
|
|
|
libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2008-08-27 11:19:45 +00:00
|
|
|
if WITH_OPENVZ
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_openvz.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_openvz_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
|
2008-08-27 11:19:45 +00:00
|
|
|
endif
|
|
|
|
|
2010-12-17 10:28:20 +00:00
|
|
|
if WITH_VMWARE
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_vmware.la
|
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
|
|
|
|
libvirt_driver_vmware_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
|
2010-12-17 10:28:20 +00:00
|
|
|
libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2009-04-17 16:09:07 +00:00
|
|
|
if WITH_VBOX
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_vbox.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_vbox_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2010-12-14 22:07:57 +00:00
|
|
|
libvirt_driver_vbox_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS)
|
2009-04-17 16:09:07 +00:00
|
|
|
libvirt_driver_vbox_la_SOURCES = $(VBOX_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2010-03-14 11:11:51 +00:00
|
|
|
if WITH_XENAPI
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_xenapi.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
|
2010-03-14 11:11:51 +00:00
|
|
|
libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(LIBCURL_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(LIBCURL_LIBS)
|
2010-03-14 11:11:51 +00:00
|
|
|
libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if WITH_LIBXL
|
2012-05-25 19:18:10 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
|
|
|
|
libvirt_driver_libxl_la_SOURCES =
|
|
|
|
libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la
|
2011-02-10 22:42:34 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_libxl.la
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
|
libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version
|
2011-02-10 22:42:34 +00:00
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_libxl.la
|
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la
|
|
|
|
endif
|
2012-05-25 19:18:10 +00:00
|
|
|
|
|
|
|
libvirt_driver_libxl_impl_la_CFLAGS = $(LIBXL_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf \
|
|
|
|
-I$(top_srcdir)/src/xenxs \
|
2011-03-29 12:39:18 +00:00
|
|
|
$(AM_CFLAGS)
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
|
|
|
libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la
|
|
|
|
libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
|
2011-02-10 22:42:34 +00:00
|
|
|
endif
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
if WITH_QEMU
|
2012-05-25 19:18:10 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la
|
|
|
|
libvirt_driver_qemu_la_SOURCES =
|
|
|
|
libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_qemu.la
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
|
libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version
|
2008-11-21 12:16:08 +00:00
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_qemu.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
2010-05-15 00:19:58 +00:00
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2012-05-25 19:18:10 +00:00
|
|
|
|
|
|
|
libvirt_driver_qemu_impl_la_CFLAGS = $(NUMACTL_CFLAGS) \
|
2011-10-18 08:06:44 +00:00
|
|
|
$(GNUTLS_CFLAGS) \
|
2012-05-03 16:10:50 +00:00
|
|
|
$(LIBNL_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
|
|
|
libvirt_driver_qemu_impl_la_LIBADD = $(NUMACTL_LIBS) \
|
2011-10-18 08:06:44 +00:00
|
|
|
$(CAPNG_LIBS) \
|
|
|
|
$(GNUTLS_LIBS) \
|
2012-05-03 16:10:50 +00:00
|
|
|
$(LIBNL_LIBS)
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES)
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2009-10-08 15:40:14 +00:00
|
|
|
conf_DATA += qemu/qemu.conf
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
augeas_DATA += qemu/libvirtd_qemu.aug
|
2012-05-29 21:49:13 +00:00
|
|
|
augeastest_DATA += test_libvirtd_qemu.aug
|
|
|
|
CLEANFILES += test_libvirtd_qemu.aug
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
2010-05-19 17:51:49 +00:00
|
|
|
EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
if WITH_LXC
|
2012-05-25 19:18:10 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la
|
|
|
|
libvirt_driver_lxc_la_SOURCES =
|
|
|
|
libvirt_driver_lxc_la_LIBADD = libvirt_driver_lxc_impl.la
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_lxc.la
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
|
libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
2008-11-21 12:16:08 +00:00
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_lxc.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
2010-05-15 00:19:58 +00:00
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2012-05-25 19:18:10 +00:00
|
|
|
|
|
|
|
libvirt_driver_lxc_impl_la_CFLAGS = \
|
2012-05-03 16:10:50 +00:00
|
|
|
$(LIBNL_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_lxc_impl_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS)
|
2012-04-02 15:47:11 +00:00
|
|
|
if HAVE_LIBBLKID
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
|
|
|
|
libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
|
2012-04-02 15:47:11 +00:00
|
|
|
endif
|
2011-03-08 20:44:14 +00:00
|
|
|
if WITH_SECDRIVER_SELINUX
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_lxc_impl_la_LIBADD += $(SELINUX_LIBS)
|
2011-03-08 20:44:14 +00:00
|
|
|
endif
|
|
|
|
if WITH_SECDRIVER_APPARMOR
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_lxc_impl_la_LIBADD += $(APPARMOR_LIBS)
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES)
|
2009-10-08 15:40:14 +00:00
|
|
|
|
|
|
|
conf_DATA += lxc/lxc.conf
|
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
augeas_DATA += lxc/libvirtd_lxc.aug
|
2012-05-29 21:49:13 +00:00
|
|
|
augeastest_DATA += test_libvirtd_lxc.aug
|
|
|
|
CLEANFILES += test_libvirtd_lxc.aug
|
2009-10-08 16:06:40 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug.in
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2008-11-19 16:58:23 +00:00
|
|
|
if WITH_UML
|
2012-05-25 19:18:10 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_uml_impl.la
|
|
|
|
libvirt_driver_uml_la_SOURCES =
|
|
|
|
libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_uml.la
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
|
libvirt_driver_uml_la_LDFLAGS = -module -avoid-version
|
2008-11-21 12:16:08 +00:00
|
|
|
else
|
2008-11-19 16:58:23 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_uml.la
|
|
|
|
# Stateful, so linked to daemon instead
|
2010-05-15 00:19:58 +00:00
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2012-05-25 19:18:10 +00:00
|
|
|
|
|
|
|
libvirt_driver_uml_impl_la_CFLAGS = $(NUMACTL_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
|
|
|
libvirt_driver_uml_impl_la_LIBADD = $(NUMACTL_LIBS)
|
|
|
|
libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES)
|
2008-11-19 16:58:23 +00:00
|
|
|
endif
|
2008-11-04 23:37:23 +00:00
|
|
|
|
2009-05-25 11:56:00 +00:00
|
|
|
|
2010-03-06 16:56:28 +00:00
|
|
|
BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
|
2009-05-25 11:56:00 +00:00
|
|
|
|
2012-07-23 14:45:20 +00:00
|
|
|
ESX_GENERATED_STAMP = .esx_vi_generator.stamp
|
|
|
|
|
|
|
|
$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP)
|
|
|
|
|
|
|
|
$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \
|
2011-08-23 21:40:40 +00:00
|
|
|
$(srcdir)/esx/esx_vi_generator.py
|
2012-07-23 14:45:20 +00:00
|
|
|
$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py \
|
|
|
|
&& touch $@
|
|
|
|
|
|
|
|
MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
|
|
|
|
|
2009-05-25 11:56:00 +00:00
|
|
|
|
2009-07-23 20:21:08 +00:00
|
|
|
if WITH_ESX
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_esx.la
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_esx_la_LIBADD = $(LIBCURL_LIBS)
|
2009-07-23 20:21:08 +00:00
|
|
|
libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
|
2010-03-06 16:56:28 +00:00
|
|
|
libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
|
2009-07-23 20:21:08 +00:00
|
|
|
endif
|
|
|
|
|
2011-07-13 14:47:01 +00:00
|
|
|
|
2011-07-13 15:05:19 +00:00
|
|
|
BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
|
|
|
|
|
2012-07-23 14:45:20 +00:00
|
|
|
HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp
|
|
|
|
|
|
|
|
$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP)
|
|
|
|
|
|
|
|
$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \
|
2011-07-13 15:05:19 +00:00
|
|
|
$(srcdir)/hyperv/hyperv_wmi_generator.py
|
2012-07-23 14:45:20 +00:00
|
|
|
$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/hyperv/hyperv_wmi_generator.py \
|
|
|
|
&& touch $@
|
|
|
|
|
|
|
|
MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP)
|
2011-07-13 15:05:19 +00:00
|
|
|
|
2011-07-13 14:47:01 +00:00
|
|
|
if WITH_HYPERV
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_hyperv.la
|
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_hyperv.la
|
|
|
|
libvirt_driver_hyperv_la_CFLAGS = $(OPENWSMAN_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2011-07-13 14:47:01 +00:00
|
|
|
libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS)
|
|
|
|
libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
|
|
|
|
libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2012-07-31 18:56:05 +00:00
|
|
|
if WITH_PARALLELS
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_parallels.la
|
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_driver_parallels.la
|
|
|
|
libvirt_driver_parallels_la_CFLAGS = \
|
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
|
|
|
libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2008-11-04 23:37:23 +00:00
|
|
|
if WITH_NETWORK
|
2012-05-25 19:18:10 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_network_impl.la
|
|
|
|
libvirt_driver_network_la_SOURCES =
|
|
|
|
libvirt_driver_network_la_LIBADD = libvirt_driver_network_impl.la
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_network.la
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la $(LIBNL_LIBS)
|
|
|
|
libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
2008-11-21 12:16:08 +00:00
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_network.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
2010-05-15 00:19:58 +00:00
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_network.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2012-05-25 19:18:10 +00:00
|
|
|
|
|
|
|
libvirt_driver_network_impl_la_CFLAGS = \
|
2012-05-03 16:10:50 +00:00
|
|
|
$(LIBNL_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2012-05-25 19:18:10 +00:00
|
|
|
libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES)
|
2008-11-04 23:37:23 +00:00
|
|
|
endif
|
2009-09-16 11:31:13 +00:00
|
|
|
EXTRA_DIST += network/default.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-11-04 23:37:23 +00:00
|
|
|
|
2009-05-20 14:26:49 +00:00
|
|
|
if WITH_NETCF
|
2009-07-21 14:02:16 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_interface.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_interface.la
|
Only build server side drivers as modules
The driver modules all use symbols which are defined in libvirt.so.
Thus for loading of modules to work, the binary that libvirt.so
is linked to must export its symbols back to modules. If the
libvirt.so itself is dlopen()d then the RTLD_GLOBAL flag must
be set. Unfortunately few, if any, programming languages use
the RTLD_GLOBAL flag when loading modules :-( This means is it
not practical to use driver modules for any libvirt client side
drivers (OpenVZ, VMWare, Hyper-V, Remote client, test).
This patch changes the build process so only server side drivers
are built as modules (Xen, QEMU, LXC, UML)
* daemon/libvirtd.c: Add missing load of 'interface' driver
* src/Makefile.am: Only build server side drivers as modules
* src/libvirt.c: Don't load any driver modules
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2011-06-01 15:36:21 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la
|
2009-07-21 14:02:16 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS)
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_interface_la_LIBADD = $(NETCF_LIBS)
|
2009-07-21 14:02:16 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
2010-10-12 11:23:18 +00:00
|
|
|
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
|
2009-07-21 14:02:16 +00:00
|
|
|
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
|
|
|
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
|
2009-05-20 14:26:49 +00:00
|
|
|
endif
|
|
|
|
|
2009-09-14 12:31:23 +00:00
|
|
|
if WITH_SECRETS
|
2009-08-14 19:48:55 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_secret.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_secret.la
|
2009-12-22 13:50:50 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
2010-05-15 00:19:58 +00:00
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_secret.la
|
2009-08-14 19:48:55 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_secret_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2009-08-14 19:48:55 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_secret_la_LIBADD = ../gnulib/lib/libgnu.la
|
2010-10-12 11:23:18 +00:00
|
|
|
libvirt_driver_secret_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
2009-08-14 19:48:55 +00:00
|
|
|
endif
|
|
|
|
libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES)
|
2009-09-14 12:31:23 +00:00
|
|
|
endif
|
2009-08-14 19:48:55 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Needed to keep automake quiet about conditionals
|
|
|
|
libvirt_driver_storage_la_SOURCES =
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_storage_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS)
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_storage_la_LIBADD =
|
2011-03-08 20:44:14 +00:00
|
|
|
if WITH_SECDRIVER_SELINUX
|
|
|
|
libvirt_driver_storage_la_LIBADD += $(SELINUX_LIBS)
|
|
|
|
endif
|
|
|
|
if WITH_SECDRIVER_APPARMOR
|
|
|
|
libvirt_driver_storage_la_LIBADD += $(APPARMOR_LIBS)
|
|
|
|
endif
|
storage: Add fs pool formatting
This patch adds the ability to make the filesystem for a filesystem
pool during a pool build.
The patch adds two new flags, no overwrite and overwrite, to control
when mkfs gets executed. By default, the patch preserves the
current behavior, i.e., if no flags are specified, pool build on a
filesystem pool only makes the directory on which the filesystem
will be mounted.
If the no overwrite flag is specified, the target device is checked
to determine if a filesystem of the type specified in the pool is
present. If a filesystem of that type is already present, mkfs is
not executed and the build call returns an error. Otherwise, mkfs
is executed and any data present on the device is overwritten.
If the overwrite flag is specified, mkfs is always executed, and any
existing data on the target device is overwritten unconditionally.
2011-08-31 13:54:07 +00:00
|
|
|
if HAVE_LIBBLKID
|
|
|
|
libvirt_driver_storage_la_CFLAGS += $(BLKID_CFLAGS)
|
|
|
|
libvirt_driver_storage_la_LIBADD += $(BLKID_LIBS)
|
|
|
|
endif
|
2012-06-05 16:28:52 +00:00
|
|
|
if WITH_STORAGE
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_storage.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_storage.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
2010-05-15 00:19:58 +00:00
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_storage.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
|
|
|
if WITH_DRIVER_MODULES
|
2010-10-12 11:23:18 +00:00
|
|
|
libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
libvirt_driver_storage_la_LDFLAGS += -module -avoid-version
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SOURCES)
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES)
|
2008-11-04 23:37:23 +00:00
|
|
|
endif
|
|
|
|
|
2008-02-20 15:45:33 +00:00
|
|
|
if WITH_STORAGE_LVM
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES)
|
2008-02-20 15:45:33 +00:00
|
|
|
endif
|
|
|
|
|
2008-02-20 15:49:25 +00:00
|
|
|
if WITH_STORAGE_ISCSI
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES)
|
2008-02-20 15:49:25 +00:00
|
|
|
endif
|
|
|
|
|
2009-04-01 16:03:22 +00:00
|
|
|
if WITH_STORAGE_SCSI
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2009-09-08 13:47:45 +00:00
|
|
|
if WITH_STORAGE_MPATH
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES)
|
|
|
|
libvirt_driver_storage_la_CFLAGS += $(DEVMAPPER_CFLAGS)
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_storage_la_LIBADD += $(DEVMAPPER_LIBS)
|
2009-09-08 13:47:45 +00:00
|
|
|
endif
|
|
|
|
|
2008-02-20 15:52:17 +00:00
|
|
|
if WITH_STORAGE_DISK
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES)
|
2008-02-20 15:52:17 +00:00
|
|
|
endif
|
2008-02-20 15:45:33 +00:00
|
|
|
|
2012-05-14 09:06:42 +00:00
|
|
|
if WITH_STORAGE_RBD
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES)
|
|
|
|
libvirt_driver_storage_la_LIBADD += $(LIBRBD_LIBS)
|
|
|
|
endif
|
|
|
|
|
2012-07-18 19:06:58 +00:00
|
|
|
if WITH_STORAGE_SHEEPDOG
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
if WITH_NODE_DEVICES
|
|
|
|
# Needed to keep automake quiet about conditionals
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_nodedev.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_nodedev.la
|
|
|
|
# Stateful, so linked to daemon instead
|
2010-05-15 00:19:58 +00:00
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_nodedev.la
|
2008-11-21 12:27:11 +00:00
|
|
|
endif
|
|
|
|
libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_nodedev_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS)
|
2012-04-02 14:46:56 +00:00
|
|
|
libvirt_driver_nodedev_la_LIBADD =
|
2011-08-16 04:28:43 +00:00
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
if HAVE_HAL
|
|
|
|
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
|
|
|
|
libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS)
|
2008-11-21 12:27:11 +00:00
|
|
|
endif
|
2009-11-12 21:48:24 +00:00
|
|
|
if HAVE_UDEV
|
|
|
|
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES)
|
2009-11-12 22:22:00 +00:00
|
|
|
libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS)
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS)
|
2009-11-12 21:48:24 +00:00
|
|
|
endif
|
2008-11-21 12:27:11 +00:00
|
|
|
|
|
|
|
if WITH_DRIVER_MODULES
|
2010-10-12 11:23:18 +00:00
|
|
|
libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la
|
2008-11-21 12:27:11 +00:00
|
|
|
libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
2010-03-25 17:46:09 +00:00
|
|
|
if WITH_NWFILTER
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_nwfilter.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_nwfilter.la
|
2012-07-31 09:57:10 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la
|
2010-03-25 17:46:09 +00:00
|
|
|
endif
|
nwfilter: Support for learning a VM's IP address
This patch implements support for learning a VM's IP address. It uses
the pcap library to listen on the VM's backend network interface (tap)
or the physical ethernet device (macvtap) and tries to capture packets
with source or destination MAC address of the VM and learn from DHCP
Offers, ARP traffic, or first-sent IPv4 packet what the IP address of
the VM's interface is. This then allows to instantiate the network
traffic filtering rules without the user having to provide the IP
parameter somewhere in the filter description or in the interface
description as a parameter. This only supports to detect the parameter
IP, which is for the assumed single IPv4 address of a VM. There is not
support for interfaces that may have multiple IP addresses (IP
aliasing) or IPv6 that may then require more than one valid IP address
to be detected. A VM can have multiple independent interfaces that each
uses a different IP address and in that case it will be attempted to
detect each one of the address independently.
So, when for example an interface description in the domain XML has
looked like this up to now:
<interface type='bridge'>
<source bridge='mybridge'/>
<model type='virtio'/>
<filterref filter='clean-traffic'>
<parameter name='IP' value='10.2.3.4'/>
</filterref>
</interface>
you may omit the IP parameter:
<interface type='bridge'>
<source bridge='mybridge'/>
<model type='virtio'/>
<filterref filter='clean-traffic'/>
</interface>
Internally I am walking the 'tree' of a VM's referenced network filters
and determine with the given variables which variables are missing. Now,
the above IP parameter may be missing and this causes a libvirt-internal
thread to be started that uses the pcap library's API to listen to the
backend interface (in case of macvtap to the physical interface) in an
attempt to determine the missing IP parameter. If the backend interface
disappears the thread terminates assuming the VM was brought down. In
case of a macvtap device a timeout is being used to wait for packets
from the given VM (filtering by VM's interface MAC address). If the VM's
macvtap device disappeared the thread also terminates. In all other
cases it tries to determine the IP address of the VM and will then apply
the rules late on the given interface, which would have happened
immediately if the IP parameter had been explicitly given. In case an
error happens while the firewall rules are applied, the VM's backend
interface is 'down'ed preventing it to communicate. Reasons for failure
for applying the network firewall rules may that an ebtables/iptables
command failes or OOM errors. Essentially the same failure reasons may
occur as when the firewall rules are applied immediately on VM start,
except that due to the late application of the filtering rules the VM
now is already running and cannot be hindered anymore from starting.
Bringing down the whole VM would probably be considered too drastic.
While a VM's IP address is attempted to be determined only limited
updates to network filters are allowed. In particular it is prevented
that filters are modified in such a way that they would introduce new
variables.
A caveat: The algorithm does not know which one is the appropriate IP
address of a VM. If the VM spoofs an IP address in its first ARP traffic
or IPv4 packets its filtering rules will be instantiated for this IP
address, thus 'locking' it to the found IP address. So, it's still
'safer' to explicitly provide the IP address of a VM's interface in the
filter description if it is known beforehand.
* configure.ac: detect libpcap
* libvirt.spec.in: require libpcap[-devel] if qemu is built
* src/internal.h: add the new ATTRIBUTE_PACKED define
* src/Makefile.am src/libvirt_private.syms: add the new modules and symbols
* src/nwfilter/nwfilter_learnipaddr.[ch]: new module being added
* src/nwfilter/nwfilter_driver.c src/conf/nwfilter_conf.[ch]
src/nwfilter/nwfilter_ebiptables_driver.[ch]
src/nwfilter/nwfilter_gentech_driver.[ch]: plu the new functionality in
* tests/nwfilterxml2xmltest: extend testing
2010-04-07 21:02:18 +00:00
|
|
|
libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \
|
2012-05-03 16:10:50 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(LIBNL_CFLAGS) $(AM_CFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS)
|
2012-05-03 16:10:50 +00:00
|
|
|
libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS)
|
2010-03-25 17:46:09 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la
|
2010-10-12 11:23:18 +00:00
|
|
|
libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version
|
2010-03-25 17:46:09 +00:00
|
|
|
endif
|
|
|
|
libvirt_driver_nwfilter_la_SOURCES = $(NWFILTER_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
2012-08-02 10:25:51 +00:00
|
|
|
libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
|
|
|
|
noinst_LTLIBRARIES += libvirt_security_manager.la
|
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_security_manager.la
|
|
|
|
libvirt_security_manager_la_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
2012-08-02 10:25:51 +00:00
|
|
|
libvirt_security_manager_la_LDFLAGS = $(AM_LDFLAGS)
|
|
|
|
libvirt_security_manager_la_LIBADD =
|
2009-03-03 10:06:49 +00:00
|
|
|
if WITH_SECDRIVER_SELINUX
|
2012-08-02 10:25:51 +00:00
|
|
|
libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
|
|
|
|
libvirt_security_manager_la_CFLAGS += $(SELINUX_CFLAGS)
|
|
|
|
libvirt_security_manager_la_LIBADD += $(SELINUX_LIBS)
|
2009-03-03 10:06:49 +00:00
|
|
|
endif
|
2009-10-08 14:34:22 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
2012-08-02 10:25:51 +00:00
|
|
|
libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
|
|
|
|
libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS)
|
|
|
|
libvirt_security_manager_la_LIBADD += $(APPARMOR_LIBS)
|
2009-10-08 14:34:22 +00:00
|
|
|
endif
|
2009-03-03 09:44:41 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# Add all conditional sources just in case...
|
|
|
|
EXTRA_DIST += \
|
|
|
|
$(TEST_DRIVER_SOURCES) \
|
|
|
|
$(REMOTE_DRIVER_SOURCES) \
|
|
|
|
$(XEN_DRIVER_SOURCES) \
|
|
|
|
$(QEMU_DRIVER_SOURCES) \
|
|
|
|
$(LXC_DRIVER_SOURCES) \
|
2008-11-19 16:58:23 +00:00
|
|
|
$(UML_DRIVER_SOURCES) \
|
2008-08-20 20:48:35 +00:00
|
|
|
$(OPENVZ_DRIVER_SOURCES) \
|
2009-07-24 14:17:06 +00:00
|
|
|
$(PHYP_DRIVER_SOURCES) \
|
2009-04-17 16:09:07 +00:00
|
|
|
$(VBOX_DRIVER_SOURCES) \
|
2010-03-14 11:11:51 +00:00
|
|
|
$(XENAPI_DRIVER_SOURCES) \
|
2011-02-10 22:42:34 +00:00
|
|
|
$(LIBXL_DRIVER_SOURCES) \
|
2009-07-23 20:21:08 +00:00
|
|
|
$(ESX_DRIVER_SOURCES) \
|
2010-03-06 16:56:28 +00:00
|
|
|
$(ESX_DRIVER_EXTRA_DIST) \
|
2011-07-13 14:47:01 +00:00
|
|
|
$(HYPERV_DRIVER_SOURCES) \
|
2011-07-13 15:05:19 +00:00
|
|
|
$(HYPERV_DRIVER_EXTRA_DIST) \
|
2012-07-31 18:56:05 +00:00
|
|
|
$(PARALLELS_DRIVER_SOURCES) \
|
2008-10-10 13:57:13 +00:00
|
|
|
$(NETWORK_DRIVER_SOURCES) \
|
2009-07-21 14:02:16 +00:00
|
|
|
$(INTERFACE_DRIVER_SOURCES) \
|
2008-08-20 20:48:35 +00:00
|
|
|
$(STORAGE_DRIVER_SOURCES) \
|
|
|
|
$(STORAGE_DRIVER_FS_SOURCES) \
|
|
|
|
$(STORAGE_DRIVER_LVM_SOURCES) \
|
|
|
|
$(STORAGE_DRIVER_ISCSI_SOURCES) \
|
2009-04-01 16:03:22 +00:00
|
|
|
$(STORAGE_DRIVER_SCSI_SOURCES) \
|
2009-09-08 13:47:45 +00:00
|
|
|
$(STORAGE_DRIVER_MPATH_SOURCES) \
|
2008-11-21 12:27:11 +00:00
|
|
|
$(STORAGE_DRIVER_DISK_SOURCES) \
|
2012-05-14 09:06:42 +00:00
|
|
|
$(STORAGE_DRIVER_RBD_SOURCES) \
|
2012-07-18 19:06:58 +00:00
|
|
|
$(STORAGE_DRIVER_SHEEPDOG_SOURCES) \
|
2008-11-21 12:27:11 +00:00
|
|
|
$(NODE_DEVICE_DRIVER_SOURCES) \
|
|
|
|
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
|
2009-11-12 21:48:24 +00:00
|
|
|
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
|
2010-03-25 17:46:07 +00:00
|
|
|
$(NWFILTER_DRIVER_SOURCES) \
|
2009-04-19 15:12:01 +00:00
|
|
|
$(SECURITY_DRIVER_SELINUX_SOURCES) \
|
2009-10-08 14:34:22 +00:00
|
|
|
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
|
2009-09-14 12:31:23 +00:00
|
|
|
$(SECRET_DRIVER_SOURCES) \
|
2010-12-17 10:28:20 +00:00
|
|
|
$(VBOX_DRIVER_EXTRA_DIST) \
|
2011-02-21 13:40:08 +00:00
|
|
|
$(VMWARE_DRIVER_SOURCES) \
|
|
|
|
$(XENXS_SOURCES)
|
2008-08-20 20:48:35 +00:00
|
|
|
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
check-local: check-augeas
|
|
|
|
|
|
|
|
.PHONY: check-augeas check-augeas-qemu check-augeas-lxc check-augeas-sanlock
|
|
|
|
|
|
|
|
check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock
|
|
|
|
|
2012-05-29 21:49:13 +00:00
|
|
|
AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
|
2012-05-30 02:15:13 +00:00
|
|
|
EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl
|
2010-03-24 08:39:54 +00:00
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
if WITH_QEMU
|
2012-05-29 21:49:13 +00:00
|
|
|
test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
|
|
|
|
$(srcdir)/qemu/qemu.conf $(AUG_GENTEST)
|
build: fix 'make distcheck' issues
We had a distributed file (remote_protocol.h, which in turn was
a prereq to remote_driver.c) depending on a generated file
(libvirt_probes.h), which is a no-no for a VPATH build from a
read-only source tree (no wonder 'make distcheck' tests precisely
that situation):
File `libvirt_driver_remote.la' does not exist.
File `libvirt_driver_remote_la-remote_driver.lo' does not exist.
Prerequisite `libvirt_probes.h' is newer than target `../../src/remote/remote_protocol.h'.
Must remake target `../../src/remote/remote_protocol.h'.
Invoking recipe from Makefile:7464 to update target `../../src/remote/remote_protocol.h'.
make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/libvirt-0.9.12/_build/src'
GEN ../../src/remote/remote_protocol.h
cannot create ../../src/remote/remote_protocol.h: Permission denied at ../../src/rpc/genprotocol.pl line 31.
make[3]: *** [../../src/remote/remote_protocol.h] Error 13
Rather than making distributed .c files depend on generated files, we
really want to ensure that compilation into .lo files is not attempted
until the generated files are present, done by this patch. Since there
were two different sets of conditionally generated files that both
feed the .lo file, I had to introduce a new variable REMOTE_DRIVER_PREREQS
to keep automake happy.
After that fix, the next issue was that make treats './foo' and 'foo'
differently in determining whether an implicit %foo rule is applicable,
with the result that locking/qemu-sanlock.conf wasn't properly being
built at the right times. Also, the output for using the .aug test
files was a bit verbose.
After fixing the src directory, the next error is related to the docs
directory, where the tarball is missing a stamp file and thus tries to
regenerate files that are already present:
GEN ../../docs/apibuild.py.stamp
Traceback (most recent call last):
File "../../docs/apibuild.py", line 2511, in <module>
rebuild("libvirt")
File "../../docs/apibuild.py", line 2495, in rebuild
builder.serialize()
File "../../docs/apibuild.py", line 2424, in serialize
output = open(filename, "w")
IOError: [Errno 13] Permission denied: '../../docs/libvirt-api.xml'
make[5]: *** [../../docs/apibuild.py.stamp] Error 1
and fixing that exposed another case of a distributed file (generated
html) depending on a built file (libvirt.h), but only when doing an
in-tree build, because of a file glob.
* src/Makefile.am ($(srcdir)/remote/remote_driver.c): Change...
(libvirt_driver_remote_la-remote_driver.lo): ...to the real
dependency.
($(builddir)/locking/%-sanlock.conf): Drop $(builddir), so that
rule gets run in time for test_libvirt_sanlock.aug.
(test_libvir*.aug): Cater to silent build.
(conf_DATA): Don't ship qemu-sanlock.conf in the tarball, since it
is trivial to regenerate.
* docs/Makefile.am (EXTRA_DIST): Ship our stamp file.
($(APIBUILD_STAMP)): Don't depend on generated file.
2012-05-30 17:30:18 +00:00
|
|
|
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< $@
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
|
2012-05-29 21:49:13 +00:00
|
|
|
check-augeas-qemu: test_libvirtd_qemu.aug
|
2010-03-24 08:39:54 +00:00
|
|
|
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
2012-05-29 21:49:13 +00:00
|
|
|
'$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \
|
2009-10-08 16:06:40 +00:00
|
|
|
fi
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
else
|
|
|
|
check-augeas-qemu:
|
2009-10-08 16:06:40 +00:00
|
|
|
endif
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
if WITH_LXC
|
2012-05-29 21:49:13 +00:00
|
|
|
test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
|
|
|
|
$(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
|
build: fix 'make distcheck' issues
We had a distributed file (remote_protocol.h, which in turn was
a prereq to remote_driver.c) depending on a generated file
(libvirt_probes.h), which is a no-no for a VPATH build from a
read-only source tree (no wonder 'make distcheck' tests precisely
that situation):
File `libvirt_driver_remote.la' does not exist.
File `libvirt_driver_remote_la-remote_driver.lo' does not exist.
Prerequisite `libvirt_probes.h' is newer than target `../../src/remote/remote_protocol.h'.
Must remake target `../../src/remote/remote_protocol.h'.
Invoking recipe from Makefile:7464 to update target `../../src/remote/remote_protocol.h'.
make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/libvirt-0.9.12/_build/src'
GEN ../../src/remote/remote_protocol.h
cannot create ../../src/remote/remote_protocol.h: Permission denied at ../../src/rpc/genprotocol.pl line 31.
make[3]: *** [../../src/remote/remote_protocol.h] Error 13
Rather than making distributed .c files depend on generated files, we
really want to ensure that compilation into .lo files is not attempted
until the generated files are present, done by this patch. Since there
were two different sets of conditionally generated files that both
feed the .lo file, I had to introduce a new variable REMOTE_DRIVER_PREREQS
to keep automake happy.
After that fix, the next issue was that make treats './foo' and 'foo'
differently in determining whether an implicit %foo rule is applicable,
with the result that locking/qemu-sanlock.conf wasn't properly being
built at the right times. Also, the output for using the .aug test
files was a bit verbose.
After fixing the src directory, the next error is related to the docs
directory, where the tarball is missing a stamp file and thus tries to
regenerate files that are already present:
GEN ../../docs/apibuild.py.stamp
Traceback (most recent call last):
File "../../docs/apibuild.py", line 2511, in <module>
rebuild("libvirt")
File "../../docs/apibuild.py", line 2495, in rebuild
builder.serialize()
File "../../docs/apibuild.py", line 2424, in serialize
output = open(filename, "w")
IOError: [Errno 13] Permission denied: '../../docs/libvirt-api.xml'
make[5]: *** [../../docs/apibuild.py.stamp] Error 1
and fixing that exposed another case of a distributed file (generated
html) depending on a built file (libvirt.h), but only when doing an
in-tree build, because of a file glob.
* src/Makefile.am ($(srcdir)/remote/remote_driver.c): Change...
(libvirt_driver_remote_la-remote_driver.lo): ...to the real
dependency.
($(builddir)/locking/%-sanlock.conf): Drop $(builddir), so that
rule gets run in time for test_libvirt_sanlock.aug.
(test_libvir*.aug): Cater to silent build.
(conf_DATA): Don't ship qemu-sanlock.conf in the tarball, since it
is trivial to regenerate.
* docs/Makefile.am (EXTRA_DIST): Ship our stamp file.
($(APIBUILD_STAMP)): Don't depend on generated file.
2012-05-30 17:30:18 +00:00
|
|
|
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
|
2012-05-29 21:49:13 +00:00
|
|
|
check-augeas-lxc: test_libvirtd_lxc.aug
|
2010-03-24 08:39:54 +00:00
|
|
|
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
2012-05-29 21:49:13 +00:00
|
|
|
'$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
|
2009-10-08 16:06:40 +00:00
|
|
|
fi
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
else
|
|
|
|
check-augeas-lxc:
|
2009-10-08 16:06:40 +00:00
|
|
|
endif
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
|
2012-05-30 15:15:22 +00:00
|
|
|
if HAVE_SANLOCK
|
2012-05-29 21:49:13 +00:00
|
|
|
test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
|
|
|
|
locking/qemu-sanlock.conf $(AUG_GENTEST)
|
build: fix 'make distcheck' issues
We had a distributed file (remote_protocol.h, which in turn was
a prereq to remote_driver.c) depending on a generated file
(libvirt_probes.h), which is a no-no for a VPATH build from a
read-only source tree (no wonder 'make distcheck' tests precisely
that situation):
File `libvirt_driver_remote.la' does not exist.
File `libvirt_driver_remote_la-remote_driver.lo' does not exist.
Prerequisite `libvirt_probes.h' is newer than target `../../src/remote/remote_protocol.h'.
Must remake target `../../src/remote/remote_protocol.h'.
Invoking recipe from Makefile:7464 to update target `../../src/remote/remote_protocol.h'.
make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/libvirt-0.9.12/_build/src'
GEN ../../src/remote/remote_protocol.h
cannot create ../../src/remote/remote_protocol.h: Permission denied at ../../src/rpc/genprotocol.pl line 31.
make[3]: *** [../../src/remote/remote_protocol.h] Error 13
Rather than making distributed .c files depend on generated files, we
really want to ensure that compilation into .lo files is not attempted
until the generated files are present, done by this patch. Since there
were two different sets of conditionally generated files that both
feed the .lo file, I had to introduce a new variable REMOTE_DRIVER_PREREQS
to keep automake happy.
After that fix, the next issue was that make treats './foo' and 'foo'
differently in determining whether an implicit %foo rule is applicable,
with the result that locking/qemu-sanlock.conf wasn't properly being
built at the right times. Also, the output for using the .aug test
files was a bit verbose.
After fixing the src directory, the next error is related to the docs
directory, where the tarball is missing a stamp file and thus tries to
regenerate files that are already present:
GEN ../../docs/apibuild.py.stamp
Traceback (most recent call last):
File "../../docs/apibuild.py", line 2511, in <module>
rebuild("libvirt")
File "../../docs/apibuild.py", line 2495, in rebuild
builder.serialize()
File "../../docs/apibuild.py", line 2424, in serialize
output = open(filename, "w")
IOError: [Errno 13] Permission denied: '../../docs/libvirt-api.xml'
make[5]: *** [../../docs/apibuild.py.stamp] Error 1
and fixing that exposed another case of a distributed file (generated
html) depending on a built file (libvirt.h), but only when doing an
in-tree build, because of a file glob.
* src/Makefile.am ($(srcdir)/remote/remote_driver.c): Change...
(libvirt_driver_remote_la-remote_driver.lo): ...to the real
dependency.
($(builddir)/locking/%-sanlock.conf): Drop $(builddir), so that
rule gets run in time for test_libvirt_sanlock.aug.
(test_libvir*.aug): Cater to silent build.
(conf_DATA): Don't ship qemu-sanlock.conf in the tarball, since it
is trivial to regenerate.
* docs/Makefile.am (EXTRA_DIST): Ship our stamp file.
($(APIBUILD_STAMP)): Don't depend on generated file.
2012-05-30 17:30:18 +00:00
|
|
|
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
|
2012-05-29 21:49:13 +00:00
|
|
|
check-augeas-sanlock: test_libvirt_sanlock.aug
|
2011-06-14 08:20:49 +00:00
|
|
|
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
2012-05-29 21:49:13 +00:00
|
|
|
'$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
|
2011-06-14 08:20:49 +00:00
|
|
|
fi
|
2012-05-30 15:15:22 +00:00
|
|
|
else
|
|
|
|
check-augeas-sanlock:
|
|
|
|
endif
|
2009-10-08 16:06:40 +00:00
|
|
|
|
2009-01-05 14:05:29 +00:00
|
|
|
#
|
|
|
|
# Build our version script. This is composed of three parts:
|
|
|
|
#
|
|
|
|
# 1. libvirt_public.syms - public API. These functions are always
|
|
|
|
# present in the library and should never change incompatibly.
|
|
|
|
#
|
|
|
|
# 2. libvirt_private.syms - private API. These symbols are private and
|
|
|
|
# semantics may change on every release, hence the version number is
|
|
|
|
# spliced in at build time. This ensures that if libvirtd, virsh, or a
|
|
|
|
# driver module was built against one libvirt release, it will refuse to
|
|
|
|
# load with another where symbols may have same names but different
|
|
|
|
# semantics. Such symbols should never be visible in an (installed)
|
|
|
|
# public header file.
|
|
|
|
#
|
|
|
|
# 3. libvirt_*.syms - dynamic private API. Like libvirt_private.syms,
|
|
|
|
# except that build options (such as --enable-debug) can mean these
|
|
|
|
# symbols aren't present at all.
|
|
|
|
#
|
|
|
|
|
2009-01-05 14:06:41 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
2009-01-06 15:16:43 +00:00
|
|
|
USED_SYM_FILES += libvirt_driver_modules.syms
|
2009-01-05 14:06:41 +00:00
|
|
|
endif
|
2009-01-05 14:07:31 +00:00
|
|
|
|
2009-01-05 14:08:26 +00:00
|
|
|
if WITH_LINUX
|
2009-01-06 15:16:43 +00:00
|
|
|
USED_SYM_FILES += libvirt_linux.syms
|
2009-01-05 14:08:26 +00:00
|
|
|
endif
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2012-04-02 15:45:01 +00:00
|
|
|
if WITH_ESX
|
|
|
|
USED_SYM_FILES += libvirt_esx.syms
|
|
|
|
endif
|
|
|
|
|
2010-03-15 01:02:57 +00:00
|
|
|
if WITH_LIBVIRTD
|
|
|
|
USED_SYM_FILES += libvirt_daemon.syms
|
|
|
|
endif
|
|
|
|
|
2012-04-02 15:45:01 +00:00
|
|
|
if WITH_OPENVZ
|
|
|
|
USED_SYM_FILES += libvirt_openvz.syms
|
|
|
|
endif
|
|
|
|
|
2010-12-21 21:39:55 +00:00
|
|
|
if WITH_VMX
|
|
|
|
USED_SYM_FILES += libvirt_vmx.syms
|
|
|
|
endif
|
|
|
|
|
2011-05-26 21:30:21 +00:00
|
|
|
if WITH_XENXS
|
|
|
|
USED_SYM_FILES += libvirt_xenxs.syms
|
|
|
|
endif
|
|
|
|
|
2011-10-11 22:22:44 +00:00
|
|
|
if HAVE_SASL
|
|
|
|
USED_SYM_FILES += libvirt_sasl.syms
|
|
|
|
endif
|
|
|
|
|
2012-07-11 13:35:43 +00:00
|
|
|
if WITH_ATOMIC_OPS_PTHREAD
|
|
|
|
USED_SYM_FILES += libvirt_atomic.syms
|
|
|
|
endif
|
|
|
|
|
2009-01-06 15:16:43 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
libvirt_public.syms \
|
|
|
|
libvirt_private.syms \
|
2012-07-11 13:35:43 +00:00
|
|
|
libvirt_atomic.syms \
|
2009-01-06 15:16:43 +00:00
|
|
|
libvirt_driver_modules.syms \
|
2011-10-11 22:22:44 +00:00
|
|
|
libvirt_daemon.syms \
|
2010-02-12 17:03:07 +00:00
|
|
|
libvirt_linux.syms \
|
2012-04-02 15:45:01 +00:00
|
|
|
libvirt_esx.syms \
|
|
|
|
libvirt_openvz.syms \
|
|
|
|
libvirt_qemu.syms \
|
2011-10-11 22:22:44 +00:00
|
|
|
libvirt_sasl.syms \
|
2011-05-26 21:30:21 +00:00
|
|
|
libvirt_vmx.syms \
|
2011-10-11 22:22:44 +00:00
|
|
|
libvirt_xenxs.syms
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2011-06-24 14:04:11 +00:00
|
|
|
GENERATED_SYM_FILES = libvirt.syms libvirt.def libvirt_qemu.def
|
|
|
|
|
|
|
|
BUILT_SOURCES += $(GENERATED_SYM_FILES)
|
2009-09-16 11:01:53 +00:00
|
|
|
|
2011-02-17 20:16:53 +00:00
|
|
|
libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \
|
|
|
|
$(top_builddir)/config.status
|
2010-03-31 12:10:08 +00:00
|
|
|
$(AM_V_GEN)rm -f $@-tmp $@ ; \
|
|
|
|
printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \
|
|
|
|
cat $(srcdir)/libvirt_public.syms >>$@-tmp && \
|
|
|
|
printf '\n\n# Private symbols\n\n' >>$@-tmp && \
|
|
|
|
printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \
|
|
|
|
printf 'global:\n\n' >>$@-tmp && \
|
2009-01-06 15:16:43 +00:00
|
|
|
for file in $(USED_SYM_FILES); do \
|
2009-01-05 14:05:29 +00:00
|
|
|
cat $(srcdir)/$$file >>$@-tmp; \
|
2010-03-31 12:10:08 +00:00
|
|
|
done && \
|
|
|
|
printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \
|
|
|
|
chmod a-w $@-tmp && \
|
2009-01-05 14:05:29 +00:00
|
|
|
mv $@-tmp libvirt.syms
|
2008-02-20 15:45:33 +00:00
|
|
|
|
2010-03-22 01:25:36 +00:00
|
|
|
libvirt.def: libvirt.syms
|
|
|
|
$(AM_V_GEN)rm -f -- $@-tmp $@ ; \
|
|
|
|
printf 'EXPORTS\n' > $@-tmp && \
|
2010-09-10 16:38:17 +00:00
|
|
|
sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d; s/[ ]*\(.*\)\;/ \1/g' $^ >> $@-tmp && \
|
2010-03-22 01:25:36 +00:00
|
|
|
chmod a-w $@-tmp && \
|
|
|
|
mv $@-tmp libvirt.def
|
|
|
|
|
2010-08-12 21:43:16 +00:00
|
|
|
libvirt_qemu.def: $(srcdir)/libvirt_qemu.syms
|
|
|
|
$(AM_V_GEN)rm -f -- $@-tmp $@ ; \
|
|
|
|
printf 'EXPORTS\n' > $@-tmp && \
|
2010-09-10 16:38:17 +00:00
|
|
|
sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d; s/[ ]*\(.*\)\;/ \1/g' $^ >> $@-tmp && \
|
2010-08-12 21:43:16 +00:00
|
|
|
chmod a-w $@-tmp && \
|
|
|
|
mv $@-tmp libvirt_qemu.def
|
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Empty source list - it merely links a bunch of convenience libs together
|
|
|
|
libvirt_la_SOURCES =
|
2010-03-22 01:25:36 +00:00
|
|
|
libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \
|
2011-06-29 04:06:48 +00:00
|
|
|
-version-info $(LIBVIRT_VERSION_INFO) \
|
Prevent crash from dlclose() of libvirt.so
When libvirt calls virInitialize it creates a thread local
for the virErrorPtr storage, and registers a callback to
cleanup memory when a thread exits. When libvirt is dlclose()d
or otherwise made non-resident, the callback function is
removed from memory, but the thread local may still exist
and if a thread later exists, it will invoke the callback
and SEGV. There may also be other thread locals with callbacks
pointing to libvirt code, so it is in general never safe to
unload libvirt.so from memory once initialized.
To allow dlclose() to succeed, but keep libvirt.so resident
in memory, link with '-z nodelete'. This issue was first
found with the libvirt CIM provider, but can potentially
hit many of the dynamic language bindings which all ultimately
involve dlopen() in some way, either on libvirt.so itself,
or on the glue code for the binding which in turns links
to libvirt
* configure.ac, src/Makefile.am: Ensure libvirt.so is linked
with -z nodelete
* cfg.mk, .gitignore, tests/Makefile.am, tests/shunloadhelper.c,
tests/shunloadtest.c: A test case to unload libvirt while
a thread is still running.
2011-09-01 16:57:06 +00:00
|
|
|
$(LIBVIRT_NODELETE) $(AM_LDFLAGS) \
|
build: use LIBADD, not LDFLAGS, for adding libraries
Per automake, LDFLAGS is used early in the line, and LIBADD
(libraries) or LDADD (programs) is used late. On platforms like
cygwin, without lazy linking, this order matters. Therefore, libtool
commands, -L, and similar should be in LDFLAGS, but -l should be in
L*ADD.
* src/Makefile.am (*_LDFLAGS): Move libraries...
(*_LIBADD): ...to their LIBADD counterpart.
2010-05-07 16:39:52 +00:00
|
|
|
$(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS)
|
2010-05-15 00:19:58 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la
|
2012-07-03 14:37:08 +00:00
|
|
|
libvirt_la_LIBADD += \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(DRIVER_MODULE_LIBS) \
|
2010-05-15 00:19:58 +00:00
|
|
|
$(CYGWIN_EXTRA_LIBADD)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS)
|
2010-05-15 00:19:58 +00:00
|
|
|
# Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we
|
|
|
|
# lose automake's automatic dependencies on an appropriate subset of
|
|
|
|
# $(libvirt_la_LIBADD). But we were careful to create
|
|
|
|
# $(libvirt_la_BUILT_LIBADD) as the subset that automake would have
|
|
|
|
# picked out for us.
|
|
|
|
libvirt_la_DEPENDENCIES = $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FILE)
|
2007-06-15 01:21:18 +00:00
|
|
|
|
2012-02-24 15:10:53 +00:00
|
|
|
if WITH_DTRACE_PROBES
|
2012-05-25 15:57:56 +00:00
|
|
|
libvirt_la_BUILT_LIBADD += libvirt_probes.lo
|
2012-05-28 11:33:23 +00:00
|
|
|
libvirt_la_DEPENDENCIES += libvirt_probes.lo libvirt_probes.o
|
2012-04-02 17:24:29 +00:00
|
|
|
nodist_libvirt_la_SOURCES = libvirt_probes.h
|
build: fix 'make dist' without dtrace
probes.h can only be generated on Linux, and then only with dtrace
installed. If it is part of the tarball, then either 'make dist'
will fail if you don't have that setup, or we would have to start
keeping probes.h in libvirt.git. Since we only need it to be
generated when dtrace is in use, it's better to avoid shipping
it in the first place, and avoid tracking it in git.
Meanwhile, there is a build dependency - since the RPC code is
generated, it can be built early; but when dtrace is enabled, we
must ensure probes.h is built even earlier. Commit 1afcfbdd tried
to fix this, but did so in a way that added probes.h into the
tarball, and broke VPATH as well. Commit ecbca767 fixed VPATH,
but didn't fix the more fundamental problem. This patch solves
the issue by adding a dependency instead.
Tested with 'make dist' in a clean VPATH builds, for both
'./configure --without-dtrace' and './configure --with-dtrace';
all configurations were able to correctly build a tarball, and
the dtrace configuration no longer sticks probes.h in the tarball.
* src/Makefile.am (REMOTE_DRIVER_GENERATED): Don't ship probes.h;
rather, make it a dependency.
2011-12-01 16:02:53 +00:00
|
|
|
if WITH_REMOTE
|
2012-06-06 15:45:04 +00:00
|
|
|
nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h
|
build: fix 'make dist' without dtrace
probes.h can only be generated on Linux, and then only with dtrace
installed. If it is part of the tarball, then either 'make dist'
will fail if you don't have that setup, or we would have to start
keeping probes.h in libvirt.git. Since we only need it to be
generated when dtrace is in use, it's better to avoid shipping
it in the first place, and avoid tracking it in git.
Meanwhile, there is a build dependency - since the RPC code is
generated, it can be built early; but when dtrace is enabled, we
must ensure probes.h is built even earlier. Commit 1afcfbdd tried
to fix this, but did so in a way that added probes.h into the
tarball, and broke VPATH as well. Commit ecbca767 fixed VPATH,
but didn't fix the more fundamental problem. This patch solves
the issue by adding a dependency instead.
Tested with 'make dist' in a clean VPATH builds, for both
'./configure --without-dtrace' and './configure --with-dtrace';
all configurations were able to correctly build a tarball, and
the dtrace configuration no longer sticks probes.h in the tarball.
* src/Makefile.am (REMOTE_DRIVER_GENERATED): Don't ship probes.h;
rather, make it a dependency.
2011-12-01 16:02:53 +00:00
|
|
|
endif WITH_REMOTE
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
|
2012-04-02 17:24:29 +00:00
|
|
|
BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp
|
|
|
|
|
|
|
|
if WITH_QEMU
|
2012-05-25 15:57:56 +00:00
|
|
|
libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo
|
2012-04-02 17:24:29 +00:00
|
|
|
nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h
|
2012-05-30 10:08:18 +00:00
|
|
|
BUILT_SOURCES += libvirt_qemu_probes.h
|
2012-04-02 17:24:29 +00:00
|
|
|
endif
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
|
|
|
|
tapsetdir = $(datadir)/systemtap/tapset
|
2012-04-02 17:24:29 +00:00
|
|
|
tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
|
2012-04-02 17:24:29 +00:00
|
|
|
%_probes.h: %_probes.d
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
$(AM_V_GEN)$(DTRACE) -o $@ -h -s $<
|
|
|
|
|
2012-05-29 20:58:56 +00:00
|
|
|
.PRECIOUS: %_probes.o
|
2012-04-02 17:24:29 +00:00
|
|
|
%_probes.o: %_probes.d
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
$(AM_V_GEN)$(DTRACE) -o $@ -G -s $<
|
|
|
|
|
2012-05-25 15:57:56 +00:00
|
|
|
%_probes.lo: %_probes.o
|
|
|
|
$(AM_V_GEN)printf %s\\n \
|
|
|
|
'# $@ - a libtool object file' \
|
|
|
|
'# Generated by libtool (GNU libtool) 2.4' \
|
|
|
|
'# Actually generated by Makefile.am, in order to shut up libtool' \
|
|
|
|
"pic_object='$<'" \
|
|
|
|
"non_pic_object='$<'" \
|
|
|
|
> $@
|
|
|
|
|
2011-09-22 10:51:55 +00:00
|
|
|
RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \
|
|
|
|
$(srcdir)/rpc/virkeepaliveprotocol.x \
|
|
|
|
$(srcdir)/remote/remote_protocol.x \
|
|
|
|
$(srcdir)/remote/qemu_protocol.x
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
|
|
|
|
libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl
|
2012-05-29 21:57:31 +00:00
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
|
2012-05-25 15:57:56 +00:00
|
|
|
%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl
|
2012-05-29 21:57:31 +00:00
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/dtrace2systemtap.pl \
|
2012-05-25 15:57:56 +00:00
|
|
|
$(bindir) $(sbindir) $(libdir) $< > $@
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
|
2012-05-25 15:57:56 +00:00
|
|
|
CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \
|
2012-04-02 17:24:29 +00:00
|
|
|
libvirt_qemu_probes.h libvirt_qemu_probes.o \
|
2012-05-25 15:57:56 +00:00
|
|
|
libvirt_qemu_probes.lo\
|
2012-04-02 17:24:29 +00:00
|
|
|
libvirt_functions.stp libvirt_probes.stp \
|
|
|
|
libvirt_qemu_probes.stp
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
endif
|
|
|
|
|
2012-04-02 17:24:29 +00:00
|
|
|
EXTRA_DIST += libvirt_probes.d libvirt_qemu_probes.d
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
|
2010-04-13 18:02:46 +00:00
|
|
|
libvirt_qemu_la_SOURCES = libvirt-qemu.c
|
|
|
|
libvirt_qemu_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \
|
2011-06-29 04:06:48 +00:00
|
|
|
-version-info $(LIBVIRT_VERSION_INFO) \
|
|
|
|
$(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) \
|
2010-06-09 18:35:49 +00:00
|
|
|
$(AM_LDFLAGS)
|
|
|
|
libvirt_qemu_la_CFLAGS = $(AM_CFLAGS)
|
2010-04-13 18:02:46 +00:00
|
|
|
libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
|
2010-07-29 20:19:40 +00:00
|
|
|
EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE)
|
2008-10-15 18:39:34 +00:00
|
|
|
|
2011-01-18 18:37:45 +00:00
|
|
|
if HAVE_SANLOCK
|
|
|
|
lockdriverdir = $(libdir)/libvirt/lock-driver
|
|
|
|
lockdriver_LTLIBRARIES = sanlock.la
|
|
|
|
|
|
|
|
sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES)
|
2012-08-02 19:10:13 +00:00
|
|
|
sanlock_la_CFLAGS = $(AM_CFLAGS)
|
2011-01-18 18:37:45 +00:00
|
|
|
sanlock_la_LDFLAGS = -module -avoid-version
|
2011-09-19 10:04:59 +00:00
|
|
|
sanlock_la_LIBADD = -lsanlock_client \
|
2011-06-14 08:20:49 +00:00
|
|
|
../gnulib/lib/libgnu.la
|
|
|
|
|
|
|
|
augeas_DATA += locking/libvirt_sanlock.aug
|
2012-05-29 21:49:13 +00:00
|
|
|
augeastest_DATA += test_libvirt_sanlock.aug
|
|
|
|
CLEANFILES += test_libvirt_sanlock.aug
|
2011-06-14 08:20:49 +00:00
|
|
|
|
build: fix 'make distcheck' issues
We had a distributed file (remote_protocol.h, which in turn was
a prereq to remote_driver.c) depending on a generated file
(libvirt_probes.h), which is a no-no for a VPATH build from a
read-only source tree (no wonder 'make distcheck' tests precisely
that situation):
File `libvirt_driver_remote.la' does not exist.
File `libvirt_driver_remote_la-remote_driver.lo' does not exist.
Prerequisite `libvirt_probes.h' is newer than target `../../src/remote/remote_protocol.h'.
Must remake target `../../src/remote/remote_protocol.h'.
Invoking recipe from Makefile:7464 to update target `../../src/remote/remote_protocol.h'.
make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/libvirt-0.9.12/_build/src'
GEN ../../src/remote/remote_protocol.h
cannot create ../../src/remote/remote_protocol.h: Permission denied at ../../src/rpc/genprotocol.pl line 31.
make[3]: *** [../../src/remote/remote_protocol.h] Error 13
Rather than making distributed .c files depend on generated files, we
really want to ensure that compilation into .lo files is not attempted
until the generated files are present, done by this patch. Since there
were two different sets of conditionally generated files that both
feed the .lo file, I had to introduce a new variable REMOTE_DRIVER_PREREQS
to keep automake happy.
After that fix, the next issue was that make treats './foo' and 'foo'
differently in determining whether an implicit %foo rule is applicable,
with the result that locking/qemu-sanlock.conf wasn't properly being
built at the right times. Also, the output for using the .aug test
files was a bit verbose.
After fixing the src directory, the next error is related to the docs
directory, where the tarball is missing a stamp file and thus tries to
regenerate files that are already present:
GEN ../../docs/apibuild.py.stamp
Traceback (most recent call last):
File "../../docs/apibuild.py", line 2511, in <module>
rebuild("libvirt")
File "../../docs/apibuild.py", line 2495, in rebuild
builder.serialize()
File "../../docs/apibuild.py", line 2424, in serialize
output = open(filename, "w")
IOError: [Errno 13] Permission denied: '../../docs/libvirt-api.xml'
make[5]: *** [../../docs/apibuild.py.stamp] Error 1
and fixing that exposed another case of a distributed file (generated
html) depending on a built file (libvirt.h), but only when doing an
in-tree build, because of a file glob.
* src/Makefile.am ($(srcdir)/remote/remote_driver.c): Change...
(libvirt_driver_remote_la-remote_driver.lo): ...to the real
dependency.
($(builddir)/locking/%-sanlock.conf): Drop $(builddir), so that
rule gets run in time for test_libvirt_sanlock.aug.
(test_libvir*.aug): Cater to silent build.
(conf_DATA): Don't ship qemu-sanlock.conf in the tarball, since it
is trivial to regenerate.
* docs/Makefile.am (EXTRA_DIST): Ship our stamp file.
($(APIBUILD_STAMP)): Don't depend on generated file.
2012-05-30 17:30:18 +00:00
|
|
|
locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
|
2011-06-29 15:24:12 +00:00
|
|
|
$(AM_V_GEN)$(MKDIR_P) locking ; \
|
2011-06-14 08:20:49 +00:00
|
|
|
cp $< $@
|
|
|
|
|
|
|
|
if WITH_QEMU
|
build: fix 'make distcheck' issues
We had a distributed file (remote_protocol.h, which in turn was
a prereq to remote_driver.c) depending on a generated file
(libvirt_probes.h), which is a no-no for a VPATH build from a
read-only source tree (no wonder 'make distcheck' tests precisely
that situation):
File `libvirt_driver_remote.la' does not exist.
File `libvirt_driver_remote_la-remote_driver.lo' does not exist.
Prerequisite `libvirt_probes.h' is newer than target `../../src/remote/remote_protocol.h'.
Must remake target `../../src/remote/remote_protocol.h'.
Invoking recipe from Makefile:7464 to update target `../../src/remote/remote_protocol.h'.
make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/libvirt-0.9.12/_build/src'
GEN ../../src/remote/remote_protocol.h
cannot create ../../src/remote/remote_protocol.h: Permission denied at ../../src/rpc/genprotocol.pl line 31.
make[3]: *** [../../src/remote/remote_protocol.h] Error 13
Rather than making distributed .c files depend on generated files, we
really want to ensure that compilation into .lo files is not attempted
until the generated files are present, done by this patch. Since there
were two different sets of conditionally generated files that both
feed the .lo file, I had to introduce a new variable REMOTE_DRIVER_PREREQS
to keep automake happy.
After that fix, the next issue was that make treats './foo' and 'foo'
differently in determining whether an implicit %foo rule is applicable,
with the result that locking/qemu-sanlock.conf wasn't properly being
built at the right times. Also, the output for using the .aug test
files was a bit verbose.
After fixing the src directory, the next error is related to the docs
directory, where the tarball is missing a stamp file and thus tries to
regenerate files that are already present:
GEN ../../docs/apibuild.py.stamp
Traceback (most recent call last):
File "../../docs/apibuild.py", line 2511, in <module>
rebuild("libvirt")
File "../../docs/apibuild.py", line 2495, in rebuild
builder.serialize()
File "../../docs/apibuild.py", line 2424, in serialize
output = open(filename, "w")
IOError: [Errno 13] Permission denied: '../../docs/libvirt-api.xml'
make[5]: *** [../../docs/apibuild.py.stamp] Error 1
and fixing that exposed another case of a distributed file (generated
html) depending on a built file (libvirt.h), but only when doing an
in-tree build, because of a file glob.
* src/Makefile.am ($(srcdir)/remote/remote_driver.c): Change...
(libvirt_driver_remote_la-remote_driver.lo): ...to the real
dependency.
($(builddir)/locking/%-sanlock.conf): Drop $(builddir), so that
rule gets run in time for test_libvirt_sanlock.aug.
(test_libvir*.aug): Cater to silent build.
(conf_DATA): Don't ship qemu-sanlock.conf in the tarball, since it
is trivial to regenerate.
* docs/Makefile.am (EXTRA_DIST): Ship our stamp file.
($(APIBUILD_STAMP)): Don't depend on generated file.
2012-05-30 17:30:18 +00:00
|
|
|
nodist_conf_DATA = locking/qemu-sanlock.conf
|
2011-06-14 08:20:49 +00:00
|
|
|
BUILT_SOURCES += locking/qemu-sanlock.conf
|
2011-10-11 21:10:17 +00:00
|
|
|
DISTCLEANFILES += locking/qemu-sanlock.conf
|
2011-06-14 08:20:49 +00:00
|
|
|
endif
|
2011-01-18 18:37:45 +00:00
|
|
|
else
|
2011-06-29 15:24:12 +00:00
|
|
|
EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES)
|
2011-01-18 18:37:45 +00:00
|
|
|
endif
|
2011-06-29 15:24:12 +00:00
|
|
|
EXTRA_DIST += locking/sanlock.conf \
|
|
|
|
locking/libvirt_sanlock.aug \
|
Autogenerate augeas test case from default config files
When adding new config file parameters, the corresponding
additions to the augeas lens' are constantly forgotten.
Also there are augeas test cases, these don't catch the
error, since they too are never updated.
To address this, the augeas test cases need to be auto-generated
from the example config files.
* build-aux/augeas-gentest.pl: Helper to generate an
augeas test file, substituting in elements from the
example config files
* src/Makefile.am, daemon/Makefile.am: Switch to
auto-generated augeas test cases
* daemon/test_libvirtd.aug, daemon/test_libvirtd.aug.in,
src/locking/test_libvirt_sanlock.aug,
src/locking/test_libvirt_sanlock.aug.in,
src/lxc/test_libvirtd_lxc.aug,
src/lxc/test_libvirtd_lxc.aug.in,
src/qemu/test_libvirtd_qemu.aug,
src/qemu/test_libvirtd_qemu.aug.in: Remove example
config file data, replacing with a ::CONFIG:: placeholder
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-05-25 10:14:15 +00:00
|
|
|
locking/test_libvirt_sanlock.aug.in
|
2011-01-18 18:37:45 +00:00
|
|
|
|
2011-06-29 15:24:12 +00:00
|
|
|
noinst_LTLIBRARIES += \
|
|
|
|
libvirt-net-rpc.la \
|
|
|
|
libvirt-net-rpc-server.la \
|
|
|
|
libvirt-net-rpc-client.la
|
2010-12-06 17:03:10 +00:00
|
|
|
|
2010-12-10 12:27:33 +00:00
|
|
|
EXTRA_DIST += \
|
2011-10-11 20:33:43 +00:00
|
|
|
dtrace2systemtap.pl \
|
|
|
|
rpc/gendispatch.pl \
|
|
|
|
rpc/genprotocol.pl \
|
|
|
|
rpc/gensystemtap.pl \
|
2011-09-22 10:51:55 +00:00
|
|
|
rpc/virnetprotocol.x \
|
|
|
|
rpc/virkeepaliveprotocol.x
|
2010-12-10 12:27:33 +00:00
|
|
|
|
2011-06-25 02:48:49 +00:00
|
|
|
VIR_NET_RPC_GENERATED = \
|
|
|
|
$(srcdir)/rpc/virnetprotocol.h \
|
2011-09-22 10:51:55 +00:00
|
|
|
$(srcdir)/rpc/virnetprotocol.c \
|
|
|
|
$(srcdir)/rpc/virkeepaliveprotocol.h \
|
|
|
|
$(srcdir)/rpc/virkeepaliveprotocol.c
|
2011-06-24 13:37:25 +00:00
|
|
|
|
2011-06-24 14:04:11 +00:00
|
|
|
BUILT_SOURCES += $(VIR_NET_RPC_GENERATED)
|
2011-06-24 13:37:25 +00:00
|
|
|
|
2010-12-06 17:03:10 +00:00
|
|
|
libvirt_net_rpc_la_SOURCES = \
|
2010-12-06 17:03:22 +00:00
|
|
|
rpc/virnetmessage.h rpc/virnetmessage.c \
|
2010-12-06 17:03:35 +00:00
|
|
|
rpc/virnetprotocol.h rpc/virnetprotocol.c \
|
2010-11-23 20:17:41 +00:00
|
|
|
rpc/virnetsocket.h rpc/virnetsocket.c \
|
2011-09-22 10:51:55 +00:00
|
|
|
rpc/virnettlscontext.h rpc/virnettlscontext.c \
|
2011-09-22 11:40:00 +00:00
|
|
|
rpc/virkeepaliveprotocol.h rpc/virkeepaliveprotocol.c \
|
|
|
|
rpc/virkeepalive.h rpc/virkeepalive.c
|
2010-12-10 12:21:18 +00:00
|
|
|
if HAVE_SASL
|
|
|
|
libvirt_net_rpc_la_SOURCES += \
|
|
|
|
rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c
|
|
|
|
else
|
|
|
|
EXTRA_DIST += \
|
|
|
|
rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c
|
|
|
|
endif
|
2010-12-06 17:03:10 +00:00
|
|
|
libvirt_net_rpc_la_CFLAGS = \
|
2010-11-23 20:17:41 +00:00
|
|
|
$(GNUTLS_CFLAGS) \
|
2010-12-10 12:21:18 +00:00
|
|
|
$(SASL_CFLAGS) \
|
2011-06-28 15:44:59 +00:00
|
|
|
$(XDR_CFLAGS) \
|
2010-12-06 17:03:10 +00:00
|
|
|
$(AM_CFLAGS)
|
|
|
|
libvirt_net_rpc_la_LDFLAGS = \
|
2010-11-23 20:17:41 +00:00
|
|
|
$(GNUTLS_LIBS) \
|
2010-12-10 12:21:18 +00:00
|
|
|
$(SASL_LIBS) \
|
2010-12-06 17:03:10 +00:00
|
|
|
$(AM_LDFLAGS) \
|
|
|
|
$(CYGWIN_EXTRA_LDFLAGS) \
|
|
|
|
$(MINGW_EXTRA_LDFLAGS)
|
|
|
|
libvirt_net_rpc_la_LIBADD = \
|
|
|
|
$(CYGWIN_EXTRA_LIBADD)
|
|
|
|
|
2010-12-01 16:36:40 +00:00
|
|
|
libvirt_net_rpc_server_la_SOURCES = \
|
|
|
|
rpc/virnetserverprogram.h rpc/virnetserverprogram.c \
|
|
|
|
rpc/virnetserverservice.h rpc/virnetserverservice.c \
|
|
|
|
rpc/virnetserverclient.h rpc/virnetserverclient.c \
|
2012-08-01 23:42:51 +00:00
|
|
|
rpc/virnetservermdns.h rpc/virnetservermdns.c \
|
2010-12-01 16:36:40 +00:00
|
|
|
rpc/virnetserver.h rpc/virnetserver.c
|
|
|
|
libvirt_net_rpc_server_la_CFLAGS = \
|
2011-03-02 17:11:42 +00:00
|
|
|
$(AVAHI_CFLAGS) \
|
2011-07-29 19:16:29 +00:00
|
|
|
$(XDR_CFLAGS) \
|
2011-07-07 21:12:26 +00:00
|
|
|
$(AM_CFLAGS) \
|
|
|
|
$(POLKIT_CFLAGS)
|
2010-12-01 16:36:40 +00:00
|
|
|
libvirt_net_rpc_server_la_LDFLAGS = \
|
|
|
|
$(AM_LDFLAGS) \
|
2011-03-02 17:11:42 +00:00
|
|
|
$(AVAHI_LIBS) \
|
2011-07-07 21:12:26 +00:00
|
|
|
$(POLKIT_LIBS) \
|
2010-12-01 16:36:40 +00:00
|
|
|
$(CYGWIN_EXTRA_LDFLAGS) \
|
|
|
|
$(MINGW_EXTRA_LDFLAGS)
|
|
|
|
libvirt_net_rpc_server_la_LIBADD = \
|
|
|
|
$(CYGWIN_EXTRA_LIBADD)
|
|
|
|
|
2010-12-01 16:35:50 +00:00
|
|
|
libvirt_net_rpc_client_la_SOURCES = \
|
|
|
|
rpc/virnetclientprogram.h rpc/virnetclientprogram.c \
|
|
|
|
rpc/virnetclientstream.h rpc/virnetclientstream.c \
|
|
|
|
rpc/virnetclient.h rpc/virnetclient.c
|
|
|
|
libvirt_net_rpc_client_la_CFLAGS = \
|
2011-07-29 19:16:29 +00:00
|
|
|
$(AM_CFLAGS) \
|
|
|
|
$(XDR_CFLAGS)
|
2010-12-01 16:35:50 +00:00
|
|
|
libvirt_net_rpc_client_la_LDFLAGS = \
|
|
|
|
$(AM_LDFLAGS) \
|
|
|
|
$(CYGWIN_EXTRA_LDFLAGS) \
|
|
|
|
$(MINGW_EXTRA_LDFLAGS)
|
|
|
|
libvirt_net_rpc_client_la_LIBADD = \
|
|
|
|
$(CYGWIN_EXTRA_LIBADD)
|
2010-12-01 16:36:40 +00:00
|
|
|
|
2008-08-20 20:55:32 +00:00
|
|
|
libexec_PROGRAMS =
|
|
|
|
|
2011-04-08 03:26:47 +00:00
|
|
|
if WITH_LIBVIRTD
|
2011-02-22 12:05:20 +00:00
|
|
|
libexec_PROGRAMS += libvirt_iohelper
|
|
|
|
libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES)
|
|
|
|
libvirt_iohelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS)
|
|
|
|
libvirt_iohelper_LDADD = \
|
|
|
|
libvirt_util.la \
|
|
|
|
../gnulib/lib/libgnu.la
|
|
|
|
|
|
|
|
libvirt_iohelper_CFLAGS = $(AM_CFLAGS)
|
2011-04-08 03:26:47 +00:00
|
|
|
endif
|
2011-02-22 12:05:20 +00:00
|
|
|
|
2008-02-20 15:52:17 +00:00
|
|
|
if WITH_STORAGE_DISK
|
2008-04-18 08:33:23 +00:00
|
|
|
if WITH_LIBVIRTD
|
2008-08-20 20:55:32 +00:00
|
|
|
libexec_PROGRAMS += libvirt_parthelper
|
2008-02-20 15:52:17 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_parthelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS)
|
2010-07-08 22:04:26 +00:00
|
|
|
libvirt_parthelper_LDADD = \
|
|
|
|
$(LIBPARTED_LIBS) \
|
|
|
|
libvirt_util.la \
|
|
|
|
../gnulib/lib/libgnu.la
|
|
|
|
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_parthelper_CFLAGS = $(LIBPARTED_CFLAGS) $(AM_CFLAGS)
|
2008-04-18 08:33:23 +00:00
|
|
|
endif
|
2008-02-20 15:52:17 +00:00
|
|
|
endif
|
2008-08-20 20:48:35 +00:00
|
|
|
EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES)
|
|
|
|
|
2008-02-20 15:52:17 +00:00
|
|
|
|
2008-08-20 20:55:32 +00:00
|
|
|
if WITH_LXC
|
|
|
|
if WITH_LIBVIRTD
|
|
|
|
libexec_PROGRAMS += libvirt_lxc
|
|
|
|
|
|
|
|
libvirt_lxc_SOURCES = \
|
|
|
|
$(LXC_CONTROLLER_SOURCES) \
|
2012-07-03 14:37:08 +00:00
|
|
|
$(NODE_INFO_SOURCES)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS)
|
2012-07-03 14:37:08 +00:00
|
|
|
libvirt_lxc_LDADD = \
|
|
|
|
$(NUMACTL_LIBS) \
|
2012-07-03 14:25:30 +00:00
|
|
|
libvirt-net-rpc-server.la \
|
|
|
|
libvirt-net-rpc.la \
|
2012-08-02 10:25:51 +00:00
|
|
|
libvirt_security_manager.la \
|
2012-07-03 14:37:08 +00:00
|
|
|
libvirt_conf.la \
|
|
|
|
libvirt_util.la \
|
2011-02-17 07:29:07 +00:00
|
|
|
../gnulib/lib/libgnu.la
|
2012-02-24 15:10:53 +00:00
|
|
|
if WITH_DTRACE_PROBES
|
2012-05-25 15:57:56 +00:00
|
|
|
libvirt_lxc_LDADD += libvirt_probes.lo
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
endif
|
2012-01-25 14:12:53 +00:00
|
|
|
if WITH_SECDRIVER_SELINUX
|
|
|
|
libvirt_lxc_LDADD += $(SELINUX_LIBS)
|
|
|
|
endif
|
2012-02-03 09:49:31 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
|
|
|
libvirt_lxc_LDADD += $(APPARMOR_LIBS)
|
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_lxc_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf \
|
2010-06-09 18:35:49 +00:00
|
|
|
$(AM_CFLAGS)
|
2011-11-01 14:59:51 +00:00
|
|
|
if HAVE_LIBBLKID
|
|
|
|
libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
|
|
|
|
libvirt_lxc_LDADD += $(BLKID_LIBS)
|
|
|
|
endif
|
2012-01-25 14:12:53 +00:00
|
|
|
if WITH_SECDRIVER_SELINUX
|
|
|
|
libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS)
|
|
|
|
endif
|
2012-02-03 09:49:31 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
|
|
|
libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS)
|
|
|
|
endif
|
2008-08-20 20:55:32 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)
|
|
|
|
|
2009-10-08 14:34:22 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
|
|
|
if WITH_LIBVIRTD
|
|
|
|
libexec_PROGRAMS += virt-aa-helper
|
|
|
|
|
|
|
|
virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
|
|
|
|
|
2010-06-09 18:35:49 +00:00
|
|
|
virt_aa_helper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS)
|
2009-10-08 14:34:22 +00:00
|
|
|
virt_aa_helper_LDADD = \
|
2010-04-26 13:41:07 +00:00
|
|
|
libvirt_conf.la \
|
|
|
|
libvirt_util.la \
|
|
|
|
../gnulib/lib/libgnu.la
|
2012-03-01 15:02:31 +00:00
|
|
|
if WITH_DTRACE_PROBES
|
2012-05-25 15:57:56 +00:00
|
|
|
virt_aa_helper_LDADD += libvirt_probes.lo
|
2012-03-01 15:02:31 +00:00
|
|
|
endif
|
2009-10-08 14:34:22 +00:00
|
|
|
virt_aa_helper_CFLAGS = \
|
2012-02-02 20:20:09 +00:00
|
|
|
-I$(top_srcdir)/src/conf \
|
|
|
|
-I$(top_srcdir)/src/security \
|
2010-06-09 18:35:49 +00:00
|
|
|
$(AM_CFLAGS)
|
2009-10-08 14:34:22 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
|
|
|
|
|
2009-09-16 11:31:13 +00:00
|
|
|
install-data-local:
|
2009-01-20 22:36:10 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images"
|
2011-11-01 11:21:21 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems"
|
2009-01-20 22:36:10 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot"
|
2011-07-22 08:38:46 +00:00
|
|
|
if HAVE_SANLOCK
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock"
|
|
|
|
endif
|
2009-01-20 22:36:10 +00:00
|
|
|
if WITH_QEMU
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu"
|
2009-07-15 21:25:01 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu"
|
2009-09-16 11:31:13 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu"
|
2009-01-20 22:36:10 +00:00
|
|
|
endif
|
|
|
|
if WITH_LXC
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
|
|
|
|
endif
|
2011-02-10 22:42:34 +00:00
|
|
|
if WITH_LIBXL
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
|
2011-04-07 22:01:58 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
|
2011-02-10 22:42:34 +00:00
|
|
|
endif
|
2009-01-20 22:36:10 +00:00
|
|
|
if WITH_UML
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml"
|
|
|
|
endif
|
|
|
|
if WITH_NETWORK
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
|
2010-04-28 13:38:47 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
|
2009-01-20 22:36:10 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/network"
|
2009-09-16 11:31:13 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart"
|
|
|
|
$(INSTALL_DATA) $(srcdir)/network/default.xml \
|
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
|
|
|
|
test -z "$(UUID)" || \
|
2010-09-10 16:38:17 +00:00
|
|
|
{ sed -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
|
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml > \
|
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t && \
|
|
|
|
cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
|
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
|
|
|
|
rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
|
2009-09-16 11:31:13 +00:00
|
|
|
test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
|
2011-06-29 04:06:48 +00:00
|
|
|
ln -s ../default.xml \
|
2009-09-16 11:31:13 +00:00
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
endif
|
|
|
|
|
|
|
|
uninstall-local::
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||:
|
2011-11-01 11:21:21 +00:00
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||:
|
2009-09-16 11:31:13 +00:00
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||:
|
2011-07-22 08:38:46 +00:00
|
|
|
if HAVE_SANLOCK
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
|
|
|
|
endif
|
2009-09-16 11:31:13 +00:00
|
|
|
if WITH_QEMU
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||:
|
2009-01-20 22:36:10 +00:00
|
|
|
endif
|
2009-09-16 11:31:13 +00:00
|
|
|
if WITH_LXC
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
|
|
|
|
endif
|
2011-02-10 22:42:34 +00:00
|
|
|
if WITH_LIBXL
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
|
2011-04-07 22:01:58 +00:00
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
|
2011-02-10 22:42:34 +00:00
|
|
|
endif
|
2009-09-16 11:31:13 +00:00
|
|
|
if WITH_UML
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||:
|
|
|
|
endif
|
|
|
|
if WITH_NETWORK
|
|
|
|
rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
|
|
|
|
rmdir "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart" || :
|
|
|
|
rmdir "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks" || :
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
|
|
|
|
endif
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||:
|
2008-06-10 10:43:28 +00:00
|
|
|
|
Rewrite all the DTrace/SystemTAP probing
The libvirtd daemon had a few crude system tap probes. Some of
these were broken during the RPC rewrite. The new modular RPC
code is structured in a way that allows much more effective
tracing. Instead of trying to hook up the original probes,
define a new set of probes for the RPC and event code.
The master probes file is now src/probes.d. This contains
probes for virNetServerClientPtr, virNetClientPtr, virSocketPtr
virNetTLSContextPtr and virNetTLSSessionPtr modules. Also add
probes for the poll event loop.
The src/dtrace2systemtap.pl script can convert the probes.d
file into a libvirt_probes.stp file to make use from systemtap
much simpler.
The src/rpc/gensystemtap.pl script can generate a set of
systemtap functions for translating RPC enum values into
printable strings. This works for all RPC header enums (program,
type, status, procedure) and also the authentication enum
The PROBE macro will automatically generate a VIR_DEBUG
statement, so any place with a PROBE can remove any existing
manual DEBUG statements.
* daemon/libvirtd.stp, daemon/probes.d: Remove obsolete probing
* daemon/libvirtd.h: Remove probe macros
* daemon/Makefile.am: Remove all probe buildings/install
* daemon/remote.c: Update authentication probes
* src/dtrace2systemtap.pl, src/rpc/gensystemtap.pl: Scripts
to generate STP files
* src/internal.h: Add probe macros
* src/probes.d: Master list of probes
* src/rpc/virnetclient.c, src/rpc/virnetserverclient.c,
src/rpc/virnetsocket.c, src/rpc/virnettlscontext.c,
src/util/event_poll.c: Insert probe points, removing any
DEBUG statements that duplicate the info
2011-09-30 13:40:23 +00:00
|
|
|
CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
|
|
|
|
DISTCLEANFILES += $(GENERATED_SYM_FILES)
|
2012-07-23 14:45:20 +00:00
|
|
|
MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED)
|