2005-11-02 12:50:21 +00:00
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
## Copyright (C) 2005-2018 Red Hat, Inc.
|
2013-05-14 23:42:12 +00:00
|
|
|
##
|
|
|
|
|
## This library is free software; you can redistribute it and/or
|
|
|
|
|
## modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
## License as published by the Free Software Foundation; either
|
|
|
|
|
## version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
##
|
|
|
|
|
## This library is distributed in the hope that it will be useful,
|
|
|
|
|
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
## Lesser General Public License for more details.
|
|
|
|
|
##
|
|
|
|
|
## You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
## License along with this library. If not, see
|
|
|
|
|
## <http://www.gnu.org/licenses/>.
|
2011-07-28 18:56:24 +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
|
|
|
# No libraries with the exception of LIBXML should be listed
|
|
|
|
|
# here. List them against the individual XXX_la_CFLAGS targets
|
2019-01-04 19:42:52 +00:00
|
|
|
# that actually use them.
|
2019-01-04 19:47:44 +00:00
|
|
|
AM_CPPFLAGS = -I../gnulib/lib \
|
2017-11-03 12:09:47 +00:00
|
|
|
-I$(top_srcdir)/gnulib/lib \
|
|
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
-I../include \
|
|
|
|
|
-I$(top_srcdir)/include \
|
|
|
|
|
-I$(srcdir)/util \
|
|
|
|
|
-I./util \
|
|
|
|
|
-DIN_LIBVIRT \
|
2019-03-12 14:11:47 +00:00
|
|
|
-Dabs_top_builddir="\"$(abs_top_builddir)\"" \
|
|
|
|
|
-Dabs_top_srcdir="\"$(abs_top_srcdir)\"" \
|
2019-01-04 19:42:52 +00:00
|
|
|
$(NULL)
|
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
|
|
|
|
2016-06-29 13:19:18 +00:00
|
|
|
WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
|
|
|
|
|
|
2017-11-03 12:09:47 +00:00
|
|
|
AM_CFLAGS = $(LIBXML_CFLAGS) \
|
build: link to glib library
Add the main glib.h to internal.h so that all common code can use it.
Historically glib allowed applications to register an alternative
memory allocator, so mixing g_malloc/g_free with malloc/free was not
safe.
This was feature was dropped in 2.46.0 with:
commit 3be6ed60aa58095691bd697344765e715a327fc1
Author: Alexander Larsson <alexl@redhat.com>
Date: Sat Jun 27 18:38:42 2015 +0200
Deprecate and drop support for memory vtables
Applications are still encourged to match g_malloc/g_free, but it is no
longer a mandatory requirement for correctness, just stylistic. This is
explicitly clarified in
commit 1f24b36607bf708f037396014b2cdbc08d67b275
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu Sep 5 14:37:54 2019 +0100
gmem: clarify that g_malloc always uses the system allocator
Applications can still use custom allocators in general, but they must
do this by linking to a library that replaces the core malloc/free
implemenentation entirely, instead of via a glib specific call.
This means that libvirt does not need to be concerned about use of
g_malloc/g_free causing an ABI change in the public libary, and can
avoid memory copying when talking to external libraries.
This patch probes for glib, which provides the foundation layer with
a collection of data structures, helper APIs, and platform portability
logic.
Later patches will introduce linkage to gobject which provides the
object type system, built on glib, and gio which providing objects
for various interesting tasks, most notably including DBus client
and server support and portable sockets APIs, but much more too.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-08-29 15:12:24 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
2017-11-03 12:09:47 +00:00
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
|
$(LOCK_CHECKING_CFLAGS) \
|
|
|
|
|
$(WIN32_EXTRA_CFLAGS) \
|
2019-08-02 11:05:37 +00:00
|
|
|
$(COVERAGE_CFLAGS) \
|
2019-03-13 16:07:24 +00:00
|
|
|
$(NULL)
|
2017-11-03 12:09:47 +00:00
|
|
|
AM_LDFLAGS = $(DRIVER_MODULES_LDFLAGS) \
|
2019-08-02 11:05:37 +00:00
|
|
|
$(COVERAGE_LDFLAGS) \
|
2017-11-03 12:09:47 +00:00
|
|
|
$(RELRO_LDFLAGS) \
|
|
|
|
|
$(NO_INDIRECT_LDFLAGS) \
|
|
|
|
|
$(CYGWIN_EXTRA_LDFLAGS) \
|
|
|
|
|
$(MINGW_EXTRA_LDFLAGS) \
|
2013-08-20 09:20:46 +00:00
|
|
|
$(NULL)
|
2018-04-19 10:42:22 +00:00
|
|
|
AM_LDFLAGS_MOD = \
|
|
|
|
|
-module \
|
|
|
|
|
-avoid-version \
|
|
|
|
|
$(LIBVIRT_NODELETE) \
|
|
|
|
|
$(AM_LDFLAGS)
|
2018-01-25 09:35:58 +00:00
|
|
|
AM_LDFLAGS_MOD_NOUNDEF = $(AM_LDFLAGS_MOD) $(NO_UNDEFINED_LDFLAGS)
|
2010-06-09 18:35:49 +00:00
|
|
|
|
2017-03-03 12:43:51 +00:00
|
|
|
POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
|
|
|
|
|
|
2017-03-02 10:46:53 +00:00
|
|
|
EXTRA_DIST = $(conf_DATA)
|
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 =
|
2012-12-14 10:54:16 +00:00
|
|
|
nodist_conf_DATA =
|
2018-02-21 18:05:56 +00:00
|
|
|
DRIVER_SOURCE_FILES =
|
|
|
|
|
STATEFUL_DRIVER_SOURCE_FILES =
|
2019-10-15 10:41:29 +00:00
|
|
|
lib_LTLIBRARIES =
|
2018-02-21 18:05:56 +00:00
|
|
|
noinst_LTLIBRARIES =
|
|
|
|
|
mod_LTLIBRARIES =
|
|
|
|
|
INSTALL_DATA_DIRS =
|
2019-01-09 16:11:12 +00:00
|
|
|
INSTALL_DATA_LOCAL =
|
|
|
|
|
UNINSTALL_LOCAL =
|
2018-02-21 18:05:56 +00:00
|
|
|
libvirt_la_BUILT_LIBADD =
|
2018-02-21 18:05:56 +00:00
|
|
|
SYM_FILES =
|
|
|
|
|
USED_SYM_FILES =
|
|
|
|
|
GENERATED_SYM_FILES =
|
2018-02-21 18:05:56 +00:00
|
|
|
augeas_DATA =
|
|
|
|
|
augeastest_DATA =
|
|
|
|
|
conf_DATA =
|
|
|
|
|
if WITH_DTRACE_PROBES
|
|
|
|
|
tapset_DATA =
|
|
|
|
|
endif WITH_DTRACE_PROBES
|
2018-02-21 18:05:56 +00:00
|
|
|
libexec_PROGRAMS =
|
|
|
|
|
RPC_PROBE_FILES =
|
2018-02-21 18:05:56 +00:00
|
|
|
LOGROTATE_FILES_IN =
|
|
|
|
|
PODFILES =
|
|
|
|
|
MANINFILES =
|
2019-07-18 15:38:36 +00:00
|
|
|
SYSTEMD_UNIT_FILES =
|
2018-02-21 18:05:56 +00:00
|
|
|
SYSTEMD_UNIT_FILES_IN =
|
|
|
|
|
SYSCONF_FILES =
|
|
|
|
|
sbin_PROGRAMS =
|
|
|
|
|
man8_MANS =
|
2018-02-21 18:05:56 +00:00
|
|
|
DRIVER_SOURCES =
|
2018-02-21 18:05:56 +00:00
|
|
|
man7_MANS =
|
2018-02-21 18:05:56 +00:00
|
|
|
|
2019-07-18 15:31:45 +00:00
|
|
|
COMMON_UNIT_VARS = \
|
2019-08-20 10:57:46 +00:00
|
|
|
-e 's|[@]runstatedir[@]|$(runstatedir)|g' \
|
2019-07-18 15:31:45 +00:00
|
|
|
-e 's|[@]sbindir[@]|$(sbindir)|g' \
|
|
|
|
|
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-10-24 10:11:18 +00:00
|
|
|
# Set these variables before we include any of the subdirs as libvirt-admin.la
|
|
|
|
|
# has to be installed after libvirt.la.
|
|
|
|
|
lib_LTLIBRARIES += libvirt.la libvirt-qemu.la libvirt-lxc.la
|
|
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
include util/Makefile.inc.am
|
2018-02-23 16:33:19 +00:00
|
|
|
include conf/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include cpu/Makefile.inc.am
|
2018-08-16 11:39:39 +00:00
|
|
|
include cpu_map/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include security/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include access/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include logging/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include locking/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include admin/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include rpc/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include phyp/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include test/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include esx/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include hyperv/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include vmx/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include vmware/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include vbox/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include openvz/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include qemu/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include bhyve/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include libxl/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include vz/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include lxc/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include interface/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include network/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include nwfilter/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include node_device/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include secret/Makefile.inc.am
|
2018-02-27 11:30:54 +00:00
|
|
|
include storage/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
include remote/Makefile.inc.am
|
2018-02-21 18:05:56 +00:00
|
|
|
|
2010-03-06 16:56:28 +00:00
|
|
|
|
2011-11-04 20:53:15 +00:00
|
|
|
THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
|
|
|
|
|
|
2013-10-21 21:36:11 +00:00
|
|
|
SECDRIVER_CFLAGS =
|
2013-02-01 19:22:26 +00:00
|
|
|
SECDRIVER_LIBS =
|
|
|
|
|
if WITH_SECDRIVER_SELINUX
|
2013-10-21 21:36:11 +00:00
|
|
|
SECDRIVER_CFLAGS += $(SELINUX_CFLAGS)
|
2013-02-01 19:22:26 +00:00
|
|
|
SECDRIVER_LIBS += $(SELINUX_LIBS)
|
2013-09-04 02:39:16 +00:00
|
|
|
endif WITH_SECDRIVER_SELINUX
|
2013-02-01 19:22:26 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
2013-10-21 21:36:11 +00:00
|
|
|
SECDRIVER_CFLAGS += $(APPARMOR_CFLAGS)
|
2013-02-01 19:22:26 +00:00
|
|
|
SECDRIVER_LIBS += $(APPARMOR_LIBS)
|
2013-09-04 02:39:16 +00:00
|
|
|
endif WITH_SECDRIVER_APPARMOR
|
2013-02-01 19:22:26 +00:00
|
|
|
|
2005-11-02 15:37:34 +00:00
|
|
|
|
2011-01-21 17:42:07 +00:00
|
|
|
moddir = $(libdir)/libvirt/connection-driver
|
2008-11-21 12:16:08 +00:00
|
|
|
|
2009-10-08 15:40:14 +00:00
|
|
|
confdir = $(sysconfdir)/libvirt
|
2019-10-15 10:41:29 +00:00
|
|
|
conf_DATA += libvirt.conf
|
2008-11-21 12:16:08 +00:00
|
|
|
|
2019-07-19 16:48:58 +00:00
|
|
|
CLEANFILES += $(nodist_conf_DATA)
|
|
|
|
|
BUILT_SOURCES += $(nodist_conf_DATA)
|
|
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
augeasdir = $(datadir)/augeas/lenses
|
|
|
|
|
|
|
|
|
|
augeastestdir = $(datadir)/augeas/lenses/tests
|
|
|
|
|
|
2019-07-19 15:52:28 +00:00
|
|
|
CLEANFILES += $(augeastest_DATA)
|
2011-07-21 07:32:34 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Internal generic driver infrastructure
|
2012-08-03 15:48:05 +00:00
|
|
|
DATATYPES_SOURCES = datatypes.h datatypes.c
|
2018-02-21 18:05:56 +00:00
|
|
|
DRIVER_SOURCES += \
|
2017-11-03 12:09:47 +00:00
|
|
|
driver.c driver.h \
|
|
|
|
|
driver-hypervisor.h \
|
|
|
|
|
driver-interface.h \
|
|
|
|
|
driver-network.h \
|
|
|
|
|
driver-nodedev.h \
|
|
|
|
|
driver-nwfilter.h \
|
|
|
|
|
driver-secret.h \
|
|
|
|
|
driver-state.h \
|
|
|
|
|
driver-storage.h \
|
|
|
|
|
driver-stream.h \
|
|
|
|
|
internal.h \
|
|
|
|
|
$(DATATYPES_SOURCES) \
|
|
|
|
|
libvirt.c libvirt_internal.h \
|
|
|
|
|
libvirt-domain.c \
|
backup: Introduce virDomainCheckpoint APIs
Introduce a bunch of new public APIs related to backup checkpoints.
Checkpoints are modeled heavily after virDomainSnapshotPtr (both
represent a point in time of the guest), although a snapshot exists
with the intent of rolling back to that state, while a checkpoint
exists to make it possible to create an incremental backup at a later
time. We may have a future hypervisor that can completely manage
checkpoints without libvirt metadata, but the first two planned
hypervisors (qemu and test) both always use libvirt for tracking
metadata relations between checkpoints, so for now, I've deferred
the counterpart of virDomainSnapshotHasMetadata for a separate
API addition at a later date if there is ever a need for it.
Note that until we allow snapshots and checkpoints to exist
simultaneously on the same domain (although the actual prevention of
this will be in a separate patch for the sake of an easier revert down
the road), that it is not possible to branch out to create more than
one checkpoint child to a given parent, although it may become
possible later when we revert to a snapshot that coincides with a
checkpoint. This also means that for now, the decision of which
checkpoint becomes the parent of a newly created one is the only
checkpoint with no child (so while there are APIs for dealing with a
current snapshot, we do not need those for checkpoints). We may end
up exposing a notion of a current checkpoint later, but it's easier to
add stuff when proven needed than to blindly support it now and wish
we hadn't exposed it.
The following map shows the API relations to snapshots, with new APIs
on the right:
Operate on a domain object to create/redefine a child:
virDomainSnapshotCreateXML virDomainCheckpointCreateXML
Operate on a child object for lifetime management:
virDomainSnapshotDelete virDomainCheckpointDelete
virDomainSnapshotFree virDomainCheckpointFree
virDomainSnapshotRef virDomainCheckpointRef
Operate on a child object to learn more about it:
virDomainSnapshotGetXMLDesc virDomainCheckpointGetXMLDesc
virDomainSnapshotGetConnect virDomainCheckpointGetConnect
virDomainSnapshotGetDomain virDomainCheckpointGetDomain
virDomainSnapshotGetName virDomainCheckpiontGetName
virDomainSnapshotGetParent virDomainCheckpiontGetParent
virDomainSnapshotHasMetadata (deferred for later)
virDomainSnapshotIsCurrent (no counterpart, see note above)
Operate on a domain object to list all children:
virDomainSnapshotNum (no counterparts, these are the old
virDomainSnapshotListNames racy interfaces)
virDomainSnapshotListAllSnapshots virDomainListAllCheckpoints
Operate on a child object to list descendents:
virDomainSnapshotNumChildren (no counterparts, these are the old
virDomainSnapshotListChildrenNames racy interfaces)
virDomainSnapshotListAllChildren virDomainCheckpointListAllChildren
Operate on a domain to locate a particular child:
virDomainSnapshotLookupByName virDomainCheckpointLookupByName
virDomainSnapshotCurrent (no counterpart, see note above)
virDomainHasCurrentSnapshot (no counterpart, old racy interface)
Operate on a snapshot to roll back to earlier state:
virDomainSnapshotRevert (no counterpart, instead checkpoints
are used in incremental backups via
XML to virDomainBackupBegin)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-03-13 19:35:26 +00:00
|
|
|
libvirt-domain-checkpoint.c \
|
2017-11-03 12:09:47 +00:00
|
|
|
libvirt-domain-snapshot.c \
|
|
|
|
|
libvirt-host.c \
|
|
|
|
|
libvirt-interface.c \
|
|
|
|
|
libvirt-network.c \
|
|
|
|
|
libvirt-nodedev.c \
|
|
|
|
|
libvirt-nwfilter.c \
|
|
|
|
|
libvirt-secret.c \
|
|
|
|
|
libvirt-storage.c \
|
|
|
|
|
libvirt-stream.c \
|
2015-11-03 11:09:25 +00:00
|
|
|
$(NULL)
|
2008-11-17 10:43:30 +00:00
|
|
|
|
2012-08-03 09:27:07 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2015-04-15 14:13:22 +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+ \*/
|
2015-04-15 14:13:22 +00:00
|
|
|
libs_prefix = remote_|qemu_|lxc_|admin_
|
|
|
|
|
other_prefix = keepalive|vir(Net|LockSpace|LXCMonitor)
|
|
|
|
|
struct_prefix = ($(libs_prefix)|$(other_prefix))
|
2010-05-19 13:36:27 +00:00
|
|
|
|
build: check correct protocol.o file
By default, libtool builds two .o files for every .lo rule:
src/foo.o - static builds
src/.libs/foo.o - shared library builds
But since commit ad42b34b disabled static builds, src/foo.o is
no longer built by default. On a fresh checkout, this means our
protocol check rules using pdwtags were testing a missing file,
and thanks to a lousy behavior of pdwtags happily giving no output
and 0 exit status (http://bugzilla.redhat.com/949034), we were
merely claiming that "dwarves is too old" and skipping the test.
However, if you swap between branches and do incremental builds,
such as building v0.10.2-maint and then switching back to master,
you end up with src/foo.o being leftover from its 0.10.2 state,
and then 'make check' fails because the .o file does not match
the protocol-structs file due to API additions in the meantime.
A simpler fix would be to always look in .libs for the .o to
be parsed; but since it is possible to pass ./configure options
to tell libtool to do a static-only build with no shared .o,
I went with the approach of finding the newest of the two files,
whenever both exist.
* src/Makefile.am (PDWTAGS): Ensure we test just-built file.
2013-04-05 17:09:32 +00:00
|
|
|
# Depending on configure options, libtool creates one or both of
|
build: use automake subdir-objects
Automake 2.0 will enable subdir-objects by default; in preparation
for that change, automake 1.14 outputs LOADS of warnings:
daemon/Makefile.am:38: warning: source file '../src/remote/remote_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
automake-1.14: warning: possible forward-incompatibility.
automake-1.14: At least a source file is in a subdirectory, but the 'subdir-objects'
automake-1.14: automake option hasn't been enabled. For now, the corresponding output
automake-1.14: object file(s) will be placed in the top-level directory. However,
automake-1.14: this behaviour will change in future Automake versions: they will
automake-1.14: unconditionally cause object files to be placed in the same subdirectory
automake-1.14: of the corresponding sources.
automake-1.14: You are advised to start using 'subdir-objects' option throughout your
automake-1.14: project, to avoid future incompatibilities.
daemon/Makefile.am:38: warning: source file '../src/remote/lxc_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
...
As automake 1.9 also supported this option, and the previous patches
fixed up the code base to work with it, it is safe to now turn it on
unconditionally.
* configure.ac (AM_INIT_AUTOMAKE): Enable subdir-objects.
* .gitignore: Ignore .dirstamp directories.
* src/Makefile.am (PDWTAGS, *-protocol-struct): Adjust to
new subdir-object location of .lo files.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-09-07 22:18:06 +00:00
|
|
|
# remote/{,.libs/}libvirt_driver_remote_la-remote_protocol.o. We want
|
|
|
|
|
# the newest of the two, in case configure options changed and a stale
|
build: check correct protocol.o file
By default, libtool builds two .o files for every .lo rule:
src/foo.o - static builds
src/.libs/foo.o - shared library builds
But since commit ad42b34b disabled static builds, src/foo.o is
no longer built by default. On a fresh checkout, this means our
protocol check rules using pdwtags were testing a missing file,
and thanks to a lousy behavior of pdwtags happily giving no output
and 0 exit status (http://bugzilla.redhat.com/949034), we were
merely claiming that "dwarves is too old" and skipping the test.
However, if you swap between branches and do incremental builds,
such as building v0.10.2-maint and then switching back to master,
you end up with src/foo.o being leftover from its 0.10.2 state,
and then 'make check' fails because the .o file does not match
the protocol-structs file due to API additions in the meantime.
A simpler fix would be to always look in .libs for the .o to
be parsed; but since it is possible to pass ./configure options
to tell libtool to do a static-only build with no shared .o,
I went with the approach of finding the newest of the two files,
whenever both exist.
* src/Makefile.am (PDWTAGS): Ensure we test just-built file.
2013-04-05 17:09:32 +00:00
|
|
|
# file is left around from an earlier build.
|
2018-02-28 14:38:20 +00:00
|
|
|
# The pdwtags output is completely different when building with clang
|
|
|
|
|
# which causes the comparison against expected output to fail, so skip
|
|
|
|
|
# if using clang as CC.
|
2011-07-13 15:35:03 +00:00
|
|
|
PDWTAGS = \
|
2018-03-01 16:32:08 +00:00
|
|
|
$(AM_V_GEN)if $(CC) -v 2>&1 | grep -q clang; then \
|
2018-02-28 14:38:20 +00:00
|
|
|
echo 'WARNING: skipping pdwtags test with Clang' >&2; \
|
|
|
|
|
exit 0; \
|
|
|
|
|
fi; \
|
|
|
|
|
if (pdwtags --help) > /dev/null 2>&1; then \
|
2017-11-03 12:09:47 +00:00
|
|
|
o=`ls -t $(<:.lo=.$(OBJEXT)) \
|
|
|
|
|
$(subst /,/.libs/,$(<:.lo=.$(OBJEXT))) \
|
|
|
|
|
2>/dev/null | sed -n 1p`; \
|
|
|
|
|
test -f "$$o" || { echo ".o for $< not found" >&2; exit 1; }; \
|
|
|
|
|
pdwtags --verbose $$o > $(@F)-t1 2> $(@F)-t2; \
|
|
|
|
|
if test ! -s $(@F)-t1 && test -s $(@F)-t2; then \
|
|
|
|
|
rm -rf $(@F)-t?; \
|
2012-01-06 23:07:34 +00:00
|
|
|
echo 'WARNING: pdwtags appears broken; skipping the $@ test' >&2;\
|
2017-11-03 12:09:47 +00:00
|
|
|
else \
|
|
|
|
|
$(PERL) -0777 -n \
|
|
|
|
|
-e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \
|
2019-09-17 11:24:25 +00:00
|
|
|
-e ' if ($$p =~ /^(struct|enum) $(struct_prefix)/) {' \
|
2017-11-03 12:09:47 +00:00
|
|
|
-e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \
|
|
|
|
|
-e ' $$p =~ s!\s+\n!\n!sg;' \
|
|
|
|
|
-e ' $$p =~ s!\s+$$!!;' \
|
|
|
|
|
-e ' $$p =~ s!\t! !g;' \
|
|
|
|
|
-e ' print "$$p\n";' \
|
|
|
|
|
-e ' $$n++;' \
|
|
|
|
|
-e ' }' \
|
|
|
|
|
-e '}' \
|
|
|
|
|
-e 'BEGIN {' \
|
|
|
|
|
-e ' print "/* -*- c -*- */\n";' \
|
|
|
|
|
-e '}' \
|
|
|
|
|
-e 'END {' \
|
|
|
|
|
-e ' if ($$n < 1) {' \
|
2010-05-19 13:36:27 +00:00
|
|
|
-e ' warn "WARNING: your pdwtags program is too old\n";' \
|
2017-11-03 12:09:47 +00:00
|
|
|
-e ' warn "WARNING: skipping the $@ test\n";' \
|
2010-05-19 13:36:27 +00:00
|
|
|
-e ' warn "WARNING: install dwarves-1.3 or newer\n";' \
|
2017-11-03 12:09:47 +00:00
|
|
|
-e ' exit 8;' \
|
|
|
|
|
-e ' }' \
|
|
|
|
|
-e '}' \
|
|
|
|
|
< $(@F)-t1 > $(@F)-t3; \
|
2012-01-06 23:07:34 +00:00
|
|
|
case $$? in 8) rm -f $(@F)-t?; exit 0;; 0) ;; *) exit 1;; esac;\
|
2017-11-03 12:09:47 +00:00
|
|
|
diff -u $(@)s $(@F)-t3; st=$$?; rm -f $(@F)-t?; exit $$st; \
|
|
|
|
|
fi; \
|
|
|
|
|
else \
|
|
|
|
|
echo 'WARNING: you lack pdwtags; skipping the $@ test' >&2; \
|
2010-05-19 13:36:27 +00:00
|
|
|
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-08-21 20:33:03 +00:00
|
|
|
# .libs/libvirt.so is built by libtool as a side-effect of the Makefile
|
2012-09-05 19:10:18 +00:00
|
|
|
# rule for libvirt.la. However, checking symbols relies on Linux ELF layout
|
|
|
|
|
if WITH_LINUX
|
2012-08-21 20:33:03 +00:00
|
|
|
check-symfile: libvirt.syms libvirt.la
|
|
|
|
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \
|
|
|
|
|
.libs/libvirt.so
|
2013-09-04 02:39:16 +00:00
|
|
|
else ! WITH_LINUX
|
2012-09-05 19:10:18 +00:00
|
|
|
check-symfile:
|
2013-09-04 02:39:16 +00:00
|
|
|
endif ! WITH_LINUX
|
2012-12-11 22:21:17 +00:00
|
|
|
check-symsorting:
|
2013-02-20 00:59:20 +00:00
|
|
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \
|
2013-02-22 23:46:25 +00:00
|
|
|
$(srcdir) $(SYM_FILES)
|
2012-12-13 22:13:21 +00:00
|
|
|
EXTRA_DIST += check-symfile.pl check-symsorting.pl
|
2012-07-24 13:37:48 +00:00
|
|
|
|
2013-09-07 21:22:18 +00:00
|
|
|
# Keep this list synced with RPC_PROBE_FILES
|
2011-07-13 15:35:03 +00:00
|
|
|
PROTOCOL_STRUCTS = \
|
|
|
|
|
$(srcdir)/remote_protocol-structs \
|
2012-12-21 14:20:04 +00:00
|
|
|
$(srcdir)/lxc_protocol-structs \
|
2011-07-13 15:35:03 +00:00
|
|
|
$(srcdir)/qemu_protocol-structs \
|
2011-09-22 10:51:55 +00:00
|
|
|
$(srcdir)/virnetprotocol-structs \
|
2013-09-07 21:22:18 +00:00
|
|
|
$(srcdir)/virkeepaliveprotocol-structs \
|
|
|
|
|
$(srcdir)/lxc_monitor_protocol-structs \
|
|
|
|
|
$(srcdir)/lock_protocol-structs \
|
2015-04-15 14:16:24 +00:00
|
|
|
$(srcdir)/admin_protocol-structs \
|
2013-09-07 21:22:18 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
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-12-21 14:20:04 +00:00
|
|
|
$(srcdir)/remote_protocol-struct \
|
|
|
|
|
$(srcdir)/qemu_protocol-struct \
|
|
|
|
|
$(srcdir)/lxc_protocol-struct: \
|
build: use automake subdir-objects
Automake 2.0 will enable subdir-objects by default; in preparation
for that change, automake 1.14 outputs LOADS of warnings:
daemon/Makefile.am:38: warning: source file '../src/remote/remote_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
automake-1.14: warning: possible forward-incompatibility.
automake-1.14: At least a source file is in a subdirectory, but the 'subdir-objects'
automake-1.14: automake option hasn't been enabled. For now, the corresponding output
automake-1.14: object file(s) will be placed in the top-level directory. However,
automake-1.14: this behaviour will change in future Automake versions: they will
automake-1.14: unconditionally cause object files to be placed in the same subdirectory
automake-1.14: of the corresponding sources.
automake-1.14: You are advised to start using 'subdir-objects' option throughout your
automake-1.14: project, to avoid future incompatibilities.
daemon/Makefile.am:38: warning: source file '../src/remote/lxc_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
...
As automake 1.9 also supported this option, and the previous patches
fixed up the code base to work with it, it is safe to now turn it on
unconditionally.
* configure.ac (AM_INIT_AUTOMAKE): Enable subdir-objects.
* .gitignore: Ignore .dirstamp directories.
* src/Makefile.am (PDWTAGS, *-protocol-struct): Adjust to
new subdir-object location of .lo files.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-09-07 22:18:06 +00:00
|
|
|
$(srcdir)/%-struct: remote/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: \
|
build: use automake subdir-objects
Automake 2.0 will enable subdir-objects by default; in preparation
for that change, automake 1.14 outputs LOADS of warnings:
daemon/Makefile.am:38: warning: source file '../src/remote/remote_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
automake-1.14: warning: possible forward-incompatibility.
automake-1.14: At least a source file is in a subdirectory, but the 'subdir-objects'
automake-1.14: automake option hasn't been enabled. For now, the corresponding output
automake-1.14: object file(s) will be placed in the top-level directory. However,
automake-1.14: this behaviour will change in future Automake versions: they will
automake-1.14: unconditionally cause object files to be placed in the same subdirectory
automake-1.14: of the corresponding sources.
automake-1.14: You are advised to start using 'subdir-objects' option throughout your
automake-1.14: project, to avoid future incompatibilities.
daemon/Makefile.am:38: warning: source file '../src/remote/lxc_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
...
As automake 1.9 also supported this option, and the previous patches
fixed up the code base to work with it, it is safe to now turn it on
unconditionally.
* configure.ac (AM_INIT_AUTOMAKE): Enable subdir-objects.
* .gitignore: Ignore .dirstamp directories.
* src/Makefile.am (PDWTAGS, *-protocol-struct): Adjust to
new subdir-object location of .lo files.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-09-07 22:18:06 +00:00
|
|
|
$(srcdir)/%-struct: rpc/libvirt_net_rpc_la-%.lo
|
2011-11-24 13:16:36 +00:00
|
|
|
$(PDWTAGS)
|
2019-08-14 13:03:57 +00:00
|
|
|
if WITH_LXC
|
2013-09-07 21:22:18 +00:00
|
|
|
$(srcdir)/lxc_monitor_protocol-struct: \
|
build: use automake subdir-objects
Automake 2.0 will enable subdir-objects by default; in preparation
for that change, automake 1.14 outputs LOADS of warnings:
daemon/Makefile.am:38: warning: source file '../src/remote/remote_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
automake-1.14: warning: possible forward-incompatibility.
automake-1.14: At least a source file is in a subdirectory, but the 'subdir-objects'
automake-1.14: automake option hasn't been enabled. For now, the corresponding output
automake-1.14: object file(s) will be placed in the top-level directory. However,
automake-1.14: this behaviour will change in future Automake versions: they will
automake-1.14: unconditionally cause object files to be placed in the same subdirectory
automake-1.14: of the corresponding sources.
automake-1.14: You are advised to start using 'subdir-objects' option throughout your
automake-1.14: project, to avoid future incompatibilities.
daemon/Makefile.am:38: warning: source file '../src/remote/lxc_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
...
As automake 1.9 also supported this option, and the previous patches
fixed up the code base to work with it, it is safe to now turn it on
unconditionally.
* configure.ac (AM_INIT_AUTOMAKE): Enable subdir-objects.
* .gitignore: Ignore .dirstamp directories.
* src/Makefile.am (PDWTAGS, *-protocol-struct): Adjust to
new subdir-object location of .lo files.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-09-07 22:18:06 +00:00
|
|
|
$(srcdir)/%-struct: lxc/libvirt_driver_lxc_impl_la-%.lo
|
2013-09-07 21:22:18 +00:00
|
|
|
$(PDWTAGS)
|
2019-08-14 13:03:57 +00:00
|
|
|
endif WITH_LXC
|
2013-09-07 21:22:18 +00:00
|
|
|
$(srcdir)/lock_protocol-struct: \
|
build: use automake subdir-objects
Automake 2.0 will enable subdir-objects by default; in preparation
for that change, automake 1.14 outputs LOADS of warnings:
daemon/Makefile.am:38: warning: source file '../src/remote/remote_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
automake-1.14: warning: possible forward-incompatibility.
automake-1.14: At least a source file is in a subdirectory, but the 'subdir-objects'
automake-1.14: automake option hasn't been enabled. For now, the corresponding output
automake-1.14: object file(s) will be placed in the top-level directory. However,
automake-1.14: this behaviour will change in future Automake versions: they will
automake-1.14: unconditionally cause object files to be placed in the same subdirectory
automake-1.14: of the corresponding sources.
automake-1.14: You are advised to start using 'subdir-objects' option throughout your
automake-1.14: project, to avoid future incompatibilities.
daemon/Makefile.am:38: warning: source file '../src/remote/lxc_protocol.c' is in a subdirectory,
daemon/Makefile.am:38: but option 'subdir-objects' is disabled
...
As automake 1.9 also supported this option, and the previous patches
fixed up the code base to work with it, it is safe to now turn it on
unconditionally.
* configure.ac (AM_INIT_AUTOMAKE): Enable subdir-objects.
* .gitignore: Ignore .dirstamp directories.
* src/Makefile.am (PDWTAGS, *-protocol-struct): Adjust to
new subdir-object location of .lo files.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-09-07 22:18:06 +00:00
|
|
|
$(srcdir)/%-struct: locking/lockd_la-%.lo
|
2013-09-07 21:22:18 +00:00
|
|
|
$(PDWTAGS)
|
2015-04-15 14:16:24 +00:00
|
|
|
$(srcdir)/admin_protocol-struct: \
|
|
|
|
|
$(srcdir)/%-struct: admin/libvirt_admin_la-%.lo
|
|
|
|
|
$(PDWTAGS)
|
2013-09-07 21:22:18 +00:00
|
|
|
|
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:
|
2013-09-04 02:39:16 +00:00
|
|
|
endif !WITH_REMOTE
|
2012-12-13 22:13:21 +00:00
|
|
|
EXTRA_DIST += $(PROTOCOL_STRUCTS)
|
2013-04-22 17:25:01 +00:00
|
|
|
|
|
|
|
|
check-drivername:
|
|
|
|
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \
|
|
|
|
|
$(srcdir)/driver.h \
|
|
|
|
|
$(srcdir)/libvirt_public.syms \
|
|
|
|
|
$(srcdir)/libvirt_qemu.syms \
|
|
|
|
|
$(srcdir)/libvirt_lxc.syms
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += check-drivername.pl
|
|
|
|
|
|
2013-04-23 12:50:18 +00:00
|
|
|
check-driverimpls:
|
|
|
|
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \
|
2013-05-16 06:16:13 +00:00
|
|
|
$(filter /%,$(DRIVER_SOURCE_FILES)) \
|
2013-07-29 13:00:00 +00:00
|
|
|
$(filter $(srcdir)/%,$(DRIVER_SOURCE_FILES)) \
|
|
|
|
|
$(addprefix $(srcdir)/,$(filter-out $(srcdir)/%, \
|
|
|
|
|
$(filter-out /%,$(DRIVER_SOURCE_FILES))))
|
2013-04-23 12:50:18 +00:00
|
|
|
|
2013-04-29 15:37:07 +00:00
|
|
|
check-aclrules:
|
|
|
|
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \
|
2013-07-29 13:00:00 +00:00
|
|
|
$(REMOTE_PROTOCOL) \
|
2013-06-24 22:03:05 +00:00
|
|
|
$(addprefix $(srcdir)/,$(filter-out /%,$(STATEFUL_DRIVER_SOURCE_FILES)))
|
2013-04-29 15:37:07 +00:00
|
|
|
|
2013-09-12 13:35:45 +00:00
|
|
|
check-aclperms:
|
|
|
|
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-aclperms.pl \
|
|
|
|
|
$(srcdir)/access/viraccessperm.h \
|
|
|
|
|
$(srcdir)/access/viraccessperm.c
|
|
|
|
|
|
2013-09-26 11:27:18 +00:00
|
|
|
EXTRA_DIST += check-driverimpls.pl check-aclrules.pl check-aclperms.pl
|
2013-04-23 12:50:18 +00:00
|
|
|
|
2013-04-22 17:25:01 +00:00
|
|
|
check-local: check-protocol check-symfile check-symsorting \
|
2013-09-12 13:35:45 +00:00
|
|
|
check-drivername check-driverimpls check-aclrules \
|
2019-10-15 10:41:29 +00:00
|
|
|
check-aclperms check-admin
|
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
|
|
|
|
|
|
|
|
#########################
|
|
|
|
|
#
|
|
|
|
|
# Build up list of libvirt.la source files based on configure conditions
|
|
|
|
|
#
|
|
|
|
|
# First deal with sources usable in non-daemon context
|
|
|
|
|
|
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
|
|
|
|
2013-02-01 12:36:06 +00:00
|
|
|
libvirt_driver_la_CFLAGS = \
|
2016-08-06 13:27:03 +00:00
|
|
|
$(GNUTLS_CFLAGS) $(CURL_CFLAGS) $(XDR_CFLAGS) \
|
2015-01-08 00:05:36 +00:00
|
|
|
-I$(srcdir)/conf $(AM_CFLAGS)
|
2013-02-01 12:36:06 +00:00
|
|
|
libvirt_driver_la_LIBADD = \
|
2013-03-20 15:02:34 +00:00
|
|
|
$(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS)
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2013-07-02 16:28:20 +00:00
|
|
|
# All .syms files should be placed in exactly one of these three lists,
|
|
|
|
|
# depending on whether they are stored in git and/or used in the build.
|
2018-02-21 18:05:56 +00:00
|
|
|
SYM_FILES += $(USED_SYM_FILES)
|
|
|
|
|
USED_SYM_FILES += $(srcdir)/libvirt_private.syms
|
|
|
|
|
GENERATED_SYM_FILES += \
|
2013-07-02 16:28:20 +00:00
|
|
|
libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \
|
|
|
|
|
$(NULL)
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2010-04-17 02:09:25 +00:00
|
|
|
|
2018-02-20 13:16:28 +00:00
|
|
|
|
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 \
|
build: fix VPATH build of remote driver
Commit 073e1575 tried to set things up so that 1) generated files
to be shipped in the tarball always live in srcdir, and 2) we have
no files in SOURCES that depend on any other files with a literal
$(srcdir) in the name, because that situation can cause confusing
results for the make expansion of $@ depending on whether the file
is found locally or via VPATH. But all my testing for that patch
was done incrementally, where all the protocol.[ch] files had
already been generated prior to the patch and were up-to-date in
the srcdir, and thus I missed one case where $@ causes grief in a
VPATH build from a fresh checkout:
We have a pattern rule for generating remote_protocol.[ch], and
what's more, the rule for protocol.c depends on protocol.h AND
on the protocol.x file. The pattern for protocol.c is only
satisfied via the VPATH lookup for protocol.x, and if protocol.h
doesn't yet exist, the VPATH rule kicks in and we end up with a
dependency on a file with $(srcdir) in the name. Based on make's
rules for $@, this resulted in make building remote_protocol.h
into srcdir (where we want it), then remote_protocol.c into
builddir (oops, not so good for the tarball), and also causes
the build to fail (the compiler can't find the .h if it lives
in a different directory than the .c):
CC remote/libvirt_driver_remote_la-remote_protocol.lo
remote/remote_protocol.c:7:29: fatal error: remote_protocol.h: No such file or directory
#include "remote_protocol.h"
^
compilation terminated.
As before, the fix is to hard-code the output file to go into
srcdir in spite of $@; but since this is in a pattern rule, we
are forced to use $@ in the recipe, so the patch is a bit
trickier than what was done in commit 073e1575.
* src/Makefile.am (%protocol.c, %protocol.h): Force output to srcdir.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-09-17 11:29:23 +00:00
|
|
|
$< $(srcdir)/$(subst $(srcdir)/,,$@)
|
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 \
|
build: fix VPATH build of remote driver
Commit 073e1575 tried to set things up so that 1) generated files
to be shipped in the tarball always live in srcdir, and 2) we have
no files in SOURCES that depend on any other files with a literal
$(srcdir) in the name, because that situation can cause confusing
results for the make expansion of $@ depending on whether the file
is found locally or via VPATH. But all my testing for that patch
was done incrementally, where all the protocol.[ch] files had
already been generated prior to the patch and were up-to-date in
the srcdir, and thus I missed one case where $@ causes grief in a
VPATH build from a fresh checkout:
We have a pattern rule for generating remote_protocol.[ch], and
what's more, the rule for protocol.c depends on protocol.h AND
on the protocol.x file. The pattern for protocol.c is only
satisfied via the VPATH lookup for protocol.x, and if protocol.h
doesn't yet exist, the VPATH rule kicks in and we end up with a
dependency on a file with $(srcdir) in the name. Based on make's
rules for $@, this resulted in make building remote_protocol.h
into srcdir (where we want it), then remote_protocol.c into
builddir (oops, not so good for the tarball), and also causes
the build to fail (the compiler can't find the .h if it lives
in a different directory than the .c):
CC remote/libvirt_driver_remote_la-remote_protocol.lo
remote/remote_protocol.c:7:29: fatal error: remote_protocol.h: No such file or directory
#include "remote_protocol.h"
^
compilation terminated.
As before, the fix is to hard-code the output file to go into
srcdir in spite of $@; but since this is in a pattern rule, we
are forced to use $@ in the recipe, so the patch is a bit
trickier than what was done in commit 073e1575.
* src/Makefile.am (%protocol.c, %protocol.h): Force output to srcdir.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-09-17 11:29:23 +00:00
|
|
|
$< $(srcdir)/$(subst $(srcdir)/,,$@)
|
2009-09-16 15:55:16 +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
|
|
|
|
|
|
2019-07-19 16:23:29 +00:00
|
|
|
check-augeas: $(augeas_DATA) $(augeastest_DATA)
|
|
|
|
|
$(AM_V_GEN) \
|
|
|
|
|
if test -x "$(AUGPARSE)"; then \
|
|
|
|
|
for f in $(augeastest_DATA); do \
|
|
|
|
|
DIR=$$(dirname "$$f"); \
|
|
|
|
|
FILE=$$(basename "$$f"); \
|
|
|
|
|
"$(AUGPARSE)" \
|
|
|
|
|
-I "$(srcdir)/$$DIR" -I "$(builddir)/$$DIR" \
|
|
|
|
|
"$$DIR/$$FILE"; \
|
|
|
|
|
done; \
|
|
|
|
|
fi
|
|
|
|
|
.PHONY: check-augeas
|
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
|
|
|
|
2019-08-30 12:22:54 +00:00
|
|
|
AUG_GENTEST_SCRIPT = $(top_srcdir)/scripts/augeas-gentest.py
|
|
|
|
|
AUG_GENTEST = $(RUNUTF8) $(PYTHON) $(AUG_GENTEST_SCRIPT)
|
2010-03-24 08:39:54 +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
|
|
|
|
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.
|
|
|
|
|
#
|
|
|
|
|
|
2012-12-12 16:15:25 +00:00
|
|
|
USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
|
2009-01-05 14:07:31 +00:00
|
|
|
|
2009-01-05 14:08:26 +00:00
|
|
|
if WITH_LINUX
|
2012-12-12 16:15:25 +00:00
|
|
|
USED_SYM_FILES += $(srcdir)/libvirt_linux.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
else ! WITH_LINUX
|
2013-02-22 23:46:25 +00:00
|
|
|
SYM_FILES += $(srcdir)/libvirt_linux.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
endif ! WITH_LINUX
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2012-09-20 11:58:29 +00:00
|
|
|
if WITH_SASL
|
2012-12-12 16:15:25 +00:00
|
|
|
USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
else ! WITH_SASL
|
2013-02-22 23:46:25 +00:00
|
|
|
SYM_FILES += $(srcdir)/libvirt_sasl.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
endif ! WITH_SASL
|
2011-10-11 22:22:44 +00:00
|
|
|
|
2013-01-08 21:34:15 +00:00
|
|
|
if WITH_SSH2
|
2012-12-12 16:15:25 +00:00
|
|
|
USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
else ! WITH_SSH2
|
2013-02-22 23:46:25 +00:00
|
|
|
SYM_FILES += $(srcdir)/libvirt_libssh2.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
endif ! WITH_SSH2
|
2011-11-14 14:30:23 +00:00
|
|
|
|
2012-07-11 13:35:43 +00:00
|
|
|
if WITH_ATOMIC_OPS_PTHREAD
|
2012-12-12 16:15:25 +00:00
|
|
|
USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
else ! WITH_ATOMIC_OPS_PTHREAD
|
2013-02-22 23:46:25 +00:00
|
|
|
SYM_FILES += $(srcdir)/libvirt_atomic.syms
|
2013-09-04 02:39:16 +00:00
|
|
|
endif ! WITH_ATOMIC_OPS_PTHREAD
|
2012-07-11 13:35:43 +00:00
|
|
|
|
2016-11-09 14:28:35 +00:00
|
|
|
if WITH_LIBSSH
|
|
|
|
|
USED_SYM_FILES += $(srcdir)/libvirt_libssh.syms
|
|
|
|
|
else ! WITH_LIBSSH
|
|
|
|
|
SYM_FILES += $(srcdir)/libvirt_libssh.syms
|
|
|
|
|
endif ! WITH_LIBSSH
|
|
|
|
|
|
2009-01-06 15:16:43 +00:00
|
|
|
EXTRA_DIST += \
|
2017-11-03 12:09:47 +00:00
|
|
|
libvirt_public.syms \
|
|
|
|
|
libvirt_lxc.syms \
|
|
|
|
|
libvirt_qemu.syms \
|
|
|
|
|
$(SYM_FILES) \
|
2013-05-02 23:35:50 +00:00
|
|
|
$(NULL)
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2011-06-24 14:04:11 +00:00
|
|
|
BUILT_SOURCES += $(GENERATED_SYM_FILES)
|
2009-09-16 11:01:53 +00:00
|
|
|
|
2013-07-18 15:37:52 +00:00
|
|
|
libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \
|
|
|
|
|
$(ACCESS_DRIVER_SYM_FILES) \
|
2011-02-17 20:16:53 +00:00
|
|
|
$(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 && \
|
2013-07-02 16:28:20 +00:00
|
|
|
cat $(USED_SYM_FILES) $(ACCESS_DRIVER_SYM_FILES) >>$@-tmp && \
|
2010-03-31 12:10:08 +00:00
|
|
|
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
|
|
|
|
2015-05-21 23:39:26 +00:00
|
|
|
%.def: %.syms
|
2010-03-22 01:25:36 +00:00
|
|
|
$(AM_V_GEN)rm -f -- $@-tmp $@ ; \
|
|
|
|
|
printf 'EXPORTS\n' > $@-tmp && \
|
2017-11-03 12:09:47 +00:00
|
|
|
sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d' \
|
2013-07-18 15:37:52 +00:00
|
|
|
-e 's/[ ]*\(.*\)\;/ \1/g' $^ >> $@-tmp && \
|
2010-03-22 01:25:36 +00:00
|
|
|
chmod a-w $@-tmp && \
|
2015-05-21 23:39:26 +00:00
|
|
|
mv $@-tmp $@
|
Introduce an LXC specific public API & library
This patch introduces support for LXC specific public APIs. In
common with what was done for QEMU, this creates a libvirt_lxc.so
library and libvirt/libvirt-lxc.h header file.
The actual APIs are
int virDomainLxcOpenNamespace(virDomainPtr domain,
int **fdlist,
unsigned int flags);
int virDomainLxcEnterNamespace(virDomainPtr domain,
unsigned int nfdlist,
int *fdlist,
unsigned int *noldfdlist,
int **oldfdlist,
unsigned int flags);
which provide a way to use the setns() system call to move the
calling process into the container's namespace. It is not
practical to write in a generically applicable manner. The
nearest that we could get to such an API would be an API which
allows to pass a command + argv to be executed inside a
container. Even if we had such a generic API, this LXC specific
API is still useful, because it allows the caller to maintain
the current process context, in particular any I/O streams they
have open.
NB the virDomainLxcEnterNamespace() API is special in that it
runs client side, so does not involve the internal driver API.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-12-21 13:15:19 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Empty source list - it merely links a bunch of convenience libs together
|
|
|
|
|
libvirt_la_SOURCES =
|
2013-04-03 11:36:32 +00:00
|
|
|
libvirt_la_LDFLAGS = \
|
|
|
|
|
$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \
|
|
|
|
|
-version-info $(LIBVIRT_VERSION_INFO) \
|
|
|
|
|
$(LIBVIRT_NODELETE) \
|
2018-01-25 09:35:58 +00:00
|
|
|
$(NO_UNDEFINED_LDFLAGS) \
|
2019-08-21 16:13:19 +00:00
|
|
|
$(AM_LDFLAGS)
|
|
|
|
|
if WITH_MACOS
|
|
|
|
|
# macOS has two-level namespaces by default.
|
|
|
|
|
# Override it to allow symbol replacement with DYLD_INSERT_LIBRARIES
|
|
|
|
|
libvirt_la_LDFLAGS += -Wl,-flat_namespace
|
|
|
|
|
endif WITH_MACOS
|
|
|
|
|
libvirt_la_LDFLAGS += $(NULL)
|
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 += \
|
2016-11-14 14:34:04 +00:00
|
|
|
$(DRIVER_MODULES_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
|
2012-08-10 21:14:21 +00:00
|
|
|
DTRACE2SYSTEMTAP_FLAGS = --with-modules
|
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
|
|
|
|
|
|
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
|
2018-02-21 18:05:56 +00:00
|
|
|
tapset_DATA += libvirt_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='$<'" \
|
|
|
|
|
> $@
|
|
|
|
|
|
2013-09-07 21:22:18 +00:00
|
|
|
# Keep this list synced with PROTOCOL_STRUCTS
|
2018-02-21 18:05:56 +00:00
|
|
|
RPC_PROBE_FILES += $(srcdir)/rpc/virnetprotocol.x \
|
2011-09-22 10:51:55 +00:00
|
|
|
$(srcdir)/rpc/virkeepaliveprotocol.x \
|
|
|
|
|
$(srcdir)/remote/remote_protocol.x \
|
2012-12-21 14:20:04 +00:00
|
|
|
$(srcdir)/remote/lxc_protocol.x \
|
2013-03-13 19:19:22 +00:00
|
|
|
$(srcdir)/remote/qemu_protocol.x \
|
2015-04-15 14:13:22 +00:00
|
|
|
$(srcdir)/admin/admin_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
|
|
|
|
2013-07-18 15:37:52 +00:00
|
|
|
%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl \
|
|
|
|
|
$(top_builddir)/config.status
|
2012-05-29 21:57:31 +00:00
|
|
|
$(AM_V_GEN)$(PERL) -w $(srcdir)/dtrace2systemtap.pl \
|
2012-08-10 21:14:21 +00:00
|
|
|
$(DTRACE2SYSTEMTAP_FLAGS) $(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 \
|
2018-02-21 18:05:56 +00:00
|
|
|
libvirt_functions.stp libvirt_probes.stp
|
2013-09-04 02:39:16 +00:00
|
|
|
endif WITH_DTRACE_PROBES
|
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
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
EXTRA_DIST += libvirt_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
|
2013-04-03 11:36:32 +00:00
|
|
|
libvirt_qemu_la_LDFLAGS = \
|
|
|
|
|
$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \
|
|
|
|
|
-version-info $(LIBVIRT_VERSION_INFO) \
|
2018-04-19 14:14:04 +00:00
|
|
|
$(LIBVIRT_NODELETE) \
|
2013-04-03 11:36:32 +00:00
|
|
|
$(AM_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2010-06-09 18:35:49 +00:00
|
|
|
libvirt_qemu_la_CFLAGS = $(AM_CFLAGS)
|
2010-04-13 18:02:46 +00:00
|
|
|
libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
|
2008-10-15 18:39:34 +00:00
|
|
|
|
Introduce an LXC specific public API & library
This patch introduces support for LXC specific public APIs. In
common with what was done for QEMU, this creates a libvirt_lxc.so
library and libvirt/libvirt-lxc.h header file.
The actual APIs are
int virDomainLxcOpenNamespace(virDomainPtr domain,
int **fdlist,
unsigned int flags);
int virDomainLxcEnterNamespace(virDomainPtr domain,
unsigned int nfdlist,
int *fdlist,
unsigned int *noldfdlist,
int **oldfdlist,
unsigned int flags);
which provide a way to use the setns() system call to move the
calling process into the container's namespace. It is not
practical to write in a generically applicable manner. The
nearest that we could get to such an API would be an API which
allows to pass a command + argv to be executed inside a
container. Even if we had such a generic API, this LXC specific
API is still useful, because it allows the caller to maintain
the current process context, in particular any I/O streams they
have open.
NB the virDomainLxcEnterNamespace() API is special in that it
runs client side, so does not involve the internal driver API.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-12-21 13:15:19 +00:00
|
|
|
libvirt_lxc_la_SOURCES = libvirt-lxc.c
|
2013-04-03 11:36:32 +00:00
|
|
|
libvirt_lxc_la_LDFLAGS = \
|
|
|
|
|
$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_LXC_SYMBOL_FILE) \
|
|
|
|
|
-version-info $(LIBVIRT_VERSION_INFO) \
|
2018-04-19 14:14:04 +00:00
|
|
|
$(LIBVIRT_NODELETE) \
|
2013-04-03 11:36:32 +00:00
|
|
|
$(AM_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
Introduce an LXC specific public API & library
This patch introduces support for LXC specific public APIs. In
common with what was done for QEMU, this creates a libvirt_lxc.so
library and libvirt/libvirt-lxc.h header file.
The actual APIs are
int virDomainLxcOpenNamespace(virDomainPtr domain,
int **fdlist,
unsigned int flags);
int virDomainLxcEnterNamespace(virDomainPtr domain,
unsigned int nfdlist,
int *fdlist,
unsigned int *noldfdlist,
int **oldfdlist,
unsigned int flags);
which provide a way to use the setns() system call to move the
calling process into the container's namespace. It is not
practical to write in a generically applicable manner. The
nearest that we could get to such an API would be an API which
allows to pass a command + argv to be executed inside a
container. Even if we had such a generic API, this LXC specific
API is still useful, because it allows the caller to maintain
the current process context, in particular any I/O streams they
have open.
NB the virDomainLxcEnterNamespace() API is special in that it
runs client side, so does not involve the internal driver API.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-12-21 13:15:19 +00:00
|
|
|
libvirt_lxc_la_CFLAGS = $(AM_CFLAGS)
|
|
|
|
|
libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
|
|
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
EXTRA_DIST += $(SYSCONF_FILES)
|
2012-08-02 19:06:50 +00:00
|
|
|
|
|
|
|
|
install-sysconfig:
|
2012-12-13 23:28:27 +00:00
|
|
|
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
2018-02-20 14:28:00 +00:00
|
|
|
for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
|
|
|
|
do \
|
|
|
|
|
tgt=`basename $$f`; \
|
2018-06-04 21:07:16 +00:00
|
|
|
$(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
2018-02-22 15:45:38 +00:00
|
|
|
$(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
2018-02-20 14:28:00 +00:00
|
|
|
done
|
2012-08-02 19:06:50 +00:00
|
|
|
|
|
|
|
|
uninstall-sysconfig:
|
2018-02-20 14:28:00 +00:00
|
|
|
for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
|
|
|
|
do \
|
|
|
|
|
tgt=`basename $$f`; \
|
|
|
|
|
rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
|
|
|
|
done
|
2012-12-13 23:28:27 +00:00
|
|
|
rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
2012-08-02 19:06:50 +00:00
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
|
2018-02-21 12:48:23 +00:00
|
|
|
|
|
|
|
|
EXTRA_DIST += $(LOGROTATE_FILES_IN)
|
|
|
|
|
|
|
|
|
|
BUILT_SOURCES += $(LOGROTATE_FILES)
|
2018-02-22 13:23:02 +00:00
|
|
|
CLEANFILES += $(LOGROTATE_FILES)
|
2018-02-21 12:48:23 +00:00
|
|
|
|
|
|
|
|
%.logrotate: remote/%.logrotate.in
|
|
|
|
|
$(AM_V_GEN)sed \
|
|
|
|
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
|
|
|
|
< $< > $@-t && \
|
|
|
|
|
mv $@-t $@
|
|
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
if WITH_LIBVIRTD
|
2018-02-21 12:48:23 +00:00
|
|
|
install-logrotate: $(LOGROTATE_FILES)
|
|
|
|
|
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/logrotate.d/
|
|
|
|
|
for f in $(LOGROTATE_FILES) ; \
|
|
|
|
|
do \
|
|
|
|
|
tgt=`echo $$f | sed -e 's/.logrotate//'`; \
|
|
|
|
|
$(INSTALL_DATA) $$f \
|
|
|
|
|
$(DESTDIR)$(sysconfdir)/logrotate.d/$$tgt; \
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
uninstall-logrotate:
|
|
|
|
|
rm -f $(LOGROTATE_FILES:%.logrotate=$(DESTDIR)$(sysconfdir)/logrotate.d/%)
|
|
|
|
|
rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
|
2019-01-09 16:11:12 +00:00
|
|
|
|
|
|
|
|
INSTALL_DATA_LOCAL += install-logrotate
|
|
|
|
|
UNINSTALL_LOCAL += uninstall-logrotate
|
|
|
|
|
endif WITH_LIBVIRTD
|
2018-02-21 11:15:30 +00:00
|
|
|
|
2018-02-20 17:41:45 +00:00
|
|
|
|
2016-04-12 20:28:27 +00:00
|
|
|
%.8: %.8.in $(top_srcdir)/configure.ac
|
2015-02-09 16:35:05 +00:00
|
|
|
$(AM_V_GEN)sed \
|
2016-04-12 20:28:27 +00:00
|
|
|
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
|
|
|
|
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
|
|
|
|
< $< > $@-t && \
|
2015-02-09 16:35:05 +00:00
|
|
|
mv $@-t $@
|
|
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
CLEANFILES += $(man8_MANS)
|
2016-04-13 15:09:14 +00:00
|
|
|
MAINTAINERCLEANFILES += $(MANINFILES)
|
2013-08-08 14:10:38 +00:00
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
2018-02-20 14:28:00 +00:00
|
|
|
$(SYSTEMD_UNIT_FILES_IN) \
|
2016-04-13 15:09:14 +00:00
|
|
|
$(PODFILES) \
|
|
|
|
|
$(MANINFILES) \
|
2013-08-08 14:10:38 +00:00
|
|
|
$(NULL)
|
2012-08-02 19:06:50 +00:00
|
|
|
|
2011-07-07 14:02:32 +00:00
|
|
|
|
|
|
|
|
if WITH_LIBVIRTD
|
|
|
|
|
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
|
|
|
|
|
2014-01-17 12:11:58 +00:00
|
|
|
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
2011-07-07 14:02:32 +00:00
|
|
|
|
2018-02-20 14:28:00 +00:00
|
|
|
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
|
|
|
|
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
2011-07-07 14:02:32 +00:00
|
|
|
|
2018-02-20 14:28:00 +00:00
|
|
|
install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
2012-12-13 23:28:27 +00:00
|
|
|
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
2018-02-20 14:28:00 +00:00
|
|
|
for f in $(SYSTEMD_UNIT_FILES); \
|
|
|
|
|
do \
|
|
|
|
|
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
|
|
|
|
done
|
2011-07-07 14:02:32 +00:00
|
|
|
|
|
|
|
|
uninstall-systemd: uninstall-sysconfig
|
2018-02-20 14:28:00 +00:00
|
|
|
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
2012-12-13 23:28:27 +00:00
|
|
|
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
2019-01-09 16:11:12 +00:00
|
|
|
|
|
|
|
|
INSTALL_DATA_LOCAL += install-systemd
|
|
|
|
|
UNINSTALL_LOCAL += uninstall-systemd
|
|
|
|
|
endif LIBVIRT_INIT_SCRIPT_SYSTEMD
|
|
|
|
|
endif WITH_LIBVIRTD
|
2011-07-07 14:02:32 +00:00
|
|
|
|
|
|
|
|
|
2018-02-21 18:05:56 +00:00
|
|
|
EXTRA_DIST += dtrace2systemtap.pl
|
2010-12-06 17:03:10 +00:00
|
|
|
|
2010-12-01 16:36:40 +00:00
|
|
|
|
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)
|
2013-04-03 10:32:15 +00:00
|
|
|
libvirt_iohelper_LDFLAGS = \
|
|
|
|
|
$(AM_LDFLAGS) \
|
|
|
|
|
$(PIE_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2017-11-03 12:09:47 +00:00
|
|
|
libvirt_iohelper_LDADD = \
|
2019-05-16 08:27:45 +00:00
|
|
|
libvirt.la \
|
build: link to glib library
Add the main glib.h to internal.h so that all common code can use it.
Historically glib allowed applications to register an alternative
memory allocator, so mixing g_malloc/g_free with malloc/free was not
safe.
This was feature was dropped in 2.46.0 with:
commit 3be6ed60aa58095691bd697344765e715a327fc1
Author: Alexander Larsson <alexl@redhat.com>
Date: Sat Jun 27 18:38:42 2015 +0200
Deprecate and drop support for memory vtables
Applications are still encourged to match g_malloc/g_free, but it is no
longer a mandatory requirement for correctness, just stylistic. This is
explicitly clarified in
commit 1f24b36607bf708f037396014b2cdbc08d67b275
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu Sep 5 14:37:54 2019 +0100
gmem: clarify that g_malloc always uses the system allocator
Applications can still use custom allocators in general, but they must
do this by linking to a library that replaces the core malloc/free
implemenentation entirely, instead of via a glib specific call.
This means that libvirt does not need to be concerned about use of
g_malloc/g_free causing an ABI change in the public libary, and can
avoid memory copying when talking to external libraries.
This patch probes for glib, which provides the foundation layer with
a collection of data structures, helper APIs, and platform portability
logic.
Later patches will introduce linkage to gobject which provides the
object type system, built on glib, and gio which providing objects
for various interesting tasks, most notably including DBus client
and server support and portable sockets APIs, but much more too.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-08-29 15:12:24 +00:00
|
|
|
$(GLIB_LIBS) \
|
2011-02-22 12:05:20 +00:00
|
|
|
../gnulib/lib/libgnu.la
|
2012-10-29 20:17:03 +00:00
|
|
|
if WITH_DTRACE_PROBES
|
|
|
|
|
libvirt_iohelper_LDADD += libvirt_probes.lo
|
2013-09-04 02:39:16 +00:00
|
|
|
endif WITH_DTRACE_PROBES
|
2011-02-22 12:05:20 +00:00
|
|
|
|
2013-04-03 10:32:15 +00:00
|
|
|
libvirt_iohelper_CFLAGS = \
|
|
|
|
|
$(AM_CFLAGS) \
|
|
|
|
|
$(PIE_CFLAGS) \
|
|
|
|
|
$(NULL)
|
Add helper program to create custom leases
Introduce helper program to catch events from dnsmasq and maintain a custom
lease file per network. It supports dhcpv4 and dhcpv6. The file is saved as
"<interface-name>.status".
Each lease contains the following info:
<expiry-time (epoch time)> <mac> <iaid> <ip-address> <hostname> <clientid>
Example of custom leases file content:
[
{
"iaid": "1221229",
"ip-address": "2001:db8:ca2:2:1::95",
"mac-address": "52:54:00:12:a2:6d",
"hostname": "Fedora20",
"client-id": "00:04:1a:c1:d9:6b:5a:0a:e2:bc:f8:4b:1e:37:2e:38:22:55",
"expiry-time": 1393244216
},
{
"ip-address": "192.168.150.208",
"mac-address": "52:54:00:11:56:b3",
"hostname": "Wani-PC",
"client-id": "01:52:54:00:11:56:b3",
"expiry-time": 1393244248
}
]
src/Makefile.am:
* Add options to compile the helper program
src/network/bridge_driver.c:
* Introduce networkDnsmasqLeaseFileNameCustom()
* Invoke helper program along with dnsmasq
* Delete the .status file when corresponding n/w is destroyed.
src/network/leaseshelper.c
* Helper program to create the custom lease file
2014-06-02 10:19:26 +00:00
|
|
|
|
|
|
|
|
|
2013-09-04 02:39:16 +00:00
|
|
|
endif WITH_LIBVIRTD
|
2011-02-22 12:05:20 +00:00
|
|
|
|
2008-02-20 15:52:17 +00:00
|
|
|
|
2019-01-09 16:11:12 +00:00
|
|
|
install-data-local: $(INSTALL_DATA_LOCAL) \
|
|
|
|
|
$(INSTALL_DATA_DIRS:%=install-data-%)
|
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"
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2019-01-11 10:03:53 +00:00
|
|
|
uninstall-local: $(UNINSTALL_LOCAL) \
|
2019-01-09 16:11:12 +00:00
|
|
|
$(INSTALL_DATA_DIRS:%=uninstall-data-%)
|
2009-09-16 11:31:13 +00:00
|
|
|
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" ||:
|
|
|
|
|
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)
|
