mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-21 20:15:17 +00:00
Rename qemud/ directory to daemon/
* qemud/: Rename to daemon/ * Makefile.am, configure.in, src/Makefile.am, src/remote_internal.c, tests/Makefile.am, tests/eventtest.c: s/qemud/daemon/ where needed
This commit is contained in:
parent
fd5c9bb9ab
commit
5c2a1ae876
@ -3,7 +3,7 @@
|
||||
LCOV = lcov
|
||||
GENHTML = genhtml
|
||||
|
||||
SUBDIRS = gnulib/lib include src qemud tools proxy docs gnulib/tests \
|
||||
SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
|
||||
python tests po examples/domain-events/events-c examples/hellolibvirt
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
|
||||
@ -40,7 +40,7 @@ tests:
|
||||
|
||||
cov: clean-cov
|
||||
mkdir $(top_builddir)/coverage
|
||||
$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp -d $(top_srcdir)/src -d $(top_srcdir)/qemud -d $(top_srcdir)/tests
|
||||
$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp -d $(top_srcdir)/src -d $(top_srcdir)/daemon -d $(top_srcdir)/tests
|
||||
$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp -o $(top_builddir)/coverage/libvirt.info *usr*
|
||||
rm $(top_builddir)/coverage/libvirt.info.tmp
|
||||
$(GENHTML) -s -t "libvirt" -o $(top_builddir)/coverage --legend $(top_builddir)/coverage/libvirt.info
|
||||
|
@ -1694,7 +1694,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
|
||||
po/Makefile.in \
|
||||
include/libvirt/Makefile include/libvirt/libvirt.h \
|
||||
python/Makefile python/tests/Makefile \
|
||||
qemud/Makefile \
|
||||
daemon/Makefile \
|
||||
tools/Makefile \
|
||||
tests/Makefile proxy/Makefile \
|
||||
tests/xml2sexprdata/Makefile \
|
||||
|
0
qemud/.gitignore → daemon/.gitignore
vendored
0
qemud/.gitignore → daemon/.gitignore
vendored
@ -4,7 +4,7 @@ INCLUDES = \
|
||||
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
|
||||
-I../include \
|
||||
-I@top_srcdir@/include \
|
||||
-I@top_srcdir@/qemud \
|
||||
-I@top_srcdir@/daemon \
|
||||
$(LIBXML_CFLAGS) \
|
||||
$(LIBSSH2_CFLAGS) \
|
||||
$(XEN_CFLAGS) \
|
||||
@ -100,8 +100,8 @@ SECRET_CONF_SOURCES = \
|
||||
REMOTE_DRIVER_SOURCES = \
|
||||
gnutls_1_0_compat.h \
|
||||
remote_internal.c remote_internal.h \
|
||||
../qemud/remote_protocol.c \
|
||||
../qemud/remote_protocol.h
|
||||
../daemon/remote_protocol.c \
|
||||
../daemon/remote_protocol.h
|
||||
|
||||
# Mock driver, covering domains, storage, networks, etc
|
||||
TEST_DRIVER_SOURCES = \
|
||||
|
@ -5650,7 +5650,7 @@ remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open,
|
||||
|
||||
#if HAVE_SASL
|
||||
/*
|
||||
* NB, keep in sync with similar method in qemud/remote.c
|
||||
* NB, keep in sync with similar method in remote/remote.c
|
||||
*/
|
||||
static char *addrToString(struct sockaddr_storage *sa, socklen_t salen)
|
||||
{
|
||||
|
@ -147,7 +147,7 @@ TESTS += nodedevxml2xmltest
|
||||
|
||||
TESTS += interfacexml2xmltest
|
||||
|
||||
path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud
|
||||
path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/daemon
|
||||
|
||||
# NB, automake < 1.10 does not provide the real
|
||||
# abs_top_{src/build}dir variables, so don't rely
|
||||
@ -261,7 +261,7 @@ qparamtest_LDADD = $(LDADDS)
|
||||
|
||||
if WITH_LIBVIRTD
|
||||
eventtest_SOURCES = \
|
||||
eventtest.c testutils.h testutils.c ../qemud/event.c
|
||||
eventtest.c testutils.h testutils.c ../daemon/event.c
|
||||
eventtest_LDADD = -lrt $(LDADDS)
|
||||
endif
|
||||
|
||||
|
@ -13,7 +13,7 @@ test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..
|
||||
grep '^#define WITH_QEMU 1' $CONFIG_HEADER > /dev/null ||
|
||||
skip_test_ "configured without QEMU support"
|
||||
|
||||
conf="$abs_top_srcdir/qemud/libvirtd.conf"
|
||||
conf="$abs_top_srcdir/daemon/libvirtd.conf"
|
||||
|
||||
# Ensure that each commented out PARAMETER = VALUE line has the expected form.
|
||||
grep '[a-z_] *= *[^ ]' "$conf" | grep -vE '^#[a-z_]+ = ' \
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include "threads.h"
|
||||
#include "logging.h"
|
||||
#include "util.h"
|
||||
#include "../qemud/event.h"
|
||||
#include "../daemon/event.h"
|
||||
|
||||
#define NUM_FDS 5
|
||||
#define NUM_TIME 5
|
||||
|
Loading…
x
Reference in New Issue
Block a user