[libvirt] [PATCH 12/29] network: introduce virtnetworkd daemon

[Daniel P. Berrangé]

The virtnetworkd daemon will be responsible for providing the network API
driver functionality. The network driver is still loaded by the main
libvirtd daemon at this stage, so virtnetworkd must not be running at
the same time.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 .gitignore                  |  1 +
 libvirt.spec.in             |  1 +
 src/network/Makefile.inc.am | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/.gitignore b/.gitignore
index 29473c4889..6270a7418a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,6 +164,7 @@
 /src/virt-aa-helper
 /src/virtlockd
 /src/virtlogd
+/src/virtnetworkd
 /src/virtsecretd
 /src/virt-guest-shutdown.target
 /tests/*.log
diff --git a/libvirt.spec.in b/libvirt.spec.in
index e2c4bbef5d..43f22c7858 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1580,6 +1580,7 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
 
 %files daemon-driver-network
+%attr(0755, root, root) %{_sbindir}/virtnetworkd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 52270049d5..dbd6137279 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -49,6 +49,20 @@ libvirt_driver_network_impl_la_CFLAGS = \
 libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES)
 libvirt_driver_network_impl_la_LIBADD  = $(DBUS_LIBS)
 
+sbin_PROGRAMS += virtnetworkd
+
+virtnetworkd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+virtnetworkd_CFLAGS = \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DSOCK_NAME="\"virtnetworkd-sock\"" \
+       -DSOCK_NAME_RO="\"virtnetworkd-sock-ro\"" \
+       -DSOCK_NAME_ADMIN="\"virtnetworkd-admin-sock\"" \
+       -DDAEMON_NAME="\"virtnetworkd\"" \
+       -DMODULE_NAME="\"network\"" \
+       $(NULL)
+virtnetworkd_LDFLAGS = $(REMOTE_DAEMON_LDFLAGS)
+virtnetworkd_LDADD = $(REMOTE_DAEMON_LDADD)
+
 libexec_PROGRAMS += libvirt_leaseshelper
 libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES)
 libvirt_leaseshelper_LDFLAGS = \
-- 
2.21.0