qemu, xen: add missing deps on virtlockd/virtlogd sockets

The QEMU driver uses both virtlogd and virtlockd, while the Xen driver
uses virtlockd. The libvirtd.service unit contains deps on the socket
units for these services, but these deps were missed in the modular
daemons. As a result the virtlockd/virtlogd sockets are not started
when the virtqemud/virtxend daemons are started.

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
index a863917467293d123ad4e8008517014aebaed898..19b19ce3e68221da6a32b7e5dc9f0f7727866387 100644 (file)
--- a/src/libxl/virtxend.service.in
+++ b/src/libxl/virtxend.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Virtualization xen daemon
 Conflicts=libvirtd.service
+Requires=virtlockd.socket
 Requires=virtxend.socket
 Requires=virtxend-ro.socket
 Requires=virtxend-admin.socket
@@ -25,6 +26,7 @@ KillMode=process
 
 [Install]
 WantedBy=multi-user.target
+Also=virtlockd.socket
 Also=virtxend.socket
 Also=virtxend-ro.socket
 Also=virtxend-admin.socket

diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
index 8abc9d3a7fd02e12d9d5f6de7bffd991b24611f3..20e1b43a6e3395e9c072e4b1b35af272a887d8fc 100644 (file)
--- a/src/qemu/virtqemud.service.in
+++ b/src/qemu/virtqemud.service.in
@@ -1,6 +1,8 @@
 [Unit]
 Description=Virtualization qemu daemon
 Conflicts=libvirtd.service
+Requires=virtlogd.socket
+Requires=virtlockd.socket
 Requires=virtqemud.socket
 Requires=virtqemud-ro.socket
 Requires=virtqemud-admin.socket
@@ -42,6 +44,8 @@ LimitMEMLOCK=64M
 
 [Install]
 WantedBy=multi-user.target
+Also=virtlogd.socket
+Also=virtlockd.socket
 Also=virtqemud.socket
 Also=virtqemud-ro.socket
 Also=virtqemud-admin.socket