Forget last daemon/ dir artefacts

The most important part is LIBVIRTD_PATH env var fix. It is used
in virFileFindResourceFull() from tests. The libvirtd no longer
lives under daemon/.

Then, libvirtd-fail test was still failing (as expected) but not
because of missing config file but because it was trying to
execute (nonexistent) top_builddir/daemon/libvirtd which
fulfilled expected outcome and thus test did not fail.

Thirdly, lcov was told to generate coverage for daemon/ dir too.

Fourthly, our compiling documentation was still suggesting to run
daemonn/libvirtd.

And finally, some comments in a systemtap file and a probes file
were still referring to daemon/libvirtd.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 1926e21b7a79d36ae58657aa7e43e6134263c09e..709064c6a63ea185cc18b639fe3782159b6cad21 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ check-access:
 cov: clean-cov
        $(MKDIR_P) $(top_builddir)/coverage
        $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-         -d $(top_builddir)/src  -d $(top_builddir)/daemon \
+         -d $(top_builddir)/src \
          -d $(top_builddir)/tests
        $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
          -o $(top_builddir)/coverage/libvirt.info

diff --git a/docs/compiling.html.in b/docs/compiling.html.in
index 5bed7ae146f46440e8854f3dcbfe2b57b611d61e..8dcceb3eb9fb5975d5a772bf60e3592ff650ae0f 100644 (file)
--- a/docs/compiling.html.in
+++ b/docs/compiling.html.in
@@ -125,7 +125,7 @@ $ make
     <pre>
 $ su -
 # service libvirtd stop  (or systemctl stop libvirtd.service)
-# /home/to/your/checkout/daemon/libvirtd
+# /home/to/your/checkout/src/libvirtd
     </pre>
 
     <p>

diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp
index 78e94ba852e56b87ba2c1c537a313b53cdb4aa68..e01b2f79a6a3c43a00ee6a301da49bfc61b440b5 100644 (file)
--- a/examples/systemtap/lock-debug.stp
+++ b/examples/systemtap/lock-debug.stp
@@ -11,7 +11,7 @@
 # Document usage with uninstalled daemon and libs. Assuming CWD is toplevel
 # source git directory, it should be only slight modification to the following:
 #
-#     ./run stap --ldd -c daemon/libvirtd -d daemon/libvirtd
+#     ./run stap --ldd -c src/libvirtd -d src/libvirtd
 #       examples/systemtap/lock-debug.stp src/.libs/libvirt.so
 #
 # Debug RWLock mechanisms as well.

diff --git a/src/libvirt_probes.d b/src/libvirt_probes.d
index c5bda5c974bbf1552cdb9cf928e0b974e360bf27..2a8d600c0e577e26054250179cd051375a678850 100644 (file)
--- a/src/libvirt_probes.d
+++ b/src/libvirt_probes.d
@@ -52,7 +52,7 @@ provider libvirt {
        probe rpc_client_msg_rx(void *client, int len, int prog, int vers, int proc, int type, int status, int serial);
 
 
-       # file: daemon/libvirtd.c
+       # file: src/remote/remote_daemon.c
        # prefix: rpc
        probe rpc_server_client_auth_allow(void *client, int authtype, const char *identity);
        probe rpc_server_client_auth_deny(void *client, int authtype, const char *identity);

diff --git a/tests/libvirtd-fail b/tests/libvirtd-fail
index 6c61b892cb38735dae671c9b09e63fabb0040621..f9e927b61fa7622569cc9e7bbd4fd009e82a495a 100755 (executable)
--- a/tests/libvirtd-fail
+++ b/tests/libvirtd-fail
@@ -5,12 +5,12 @@
 
 if test "$VERBOSE" = yes; then
   set -x
-  $abs_top_builddir/daemon/libvirtd --version
+  $abs_top_builddir/src/libvirtd --version
 fi
 
 fail=0
 
-$abs_top_builddir/daemon/libvirtd --config=no-such-conf --timeout=5 2> log
+$abs_top_builddir/src/libvirtd --config=no-such-conf --timeout=5 2> log
 RET=$?
 
 test "$RET" != "0" && exit 0 || exit 1