[libvirt PATCH] qemu, xen: add missing deps on virtlockd/virtlogd sockets

Daniel P. Berrangé posted 1 patch 2 years, 7 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20210831110414.117335-1-berrange@redhat.com
src/libxl/virtxend.service.in | 2 ++
src/qemu/virtqemud.service.in | 4 ++++
2 files changed, 6 insertions(+)
[libvirt PATCH] qemu, xen: add missing deps on virtlockd/virtlogd sockets
Posted by Daniel P. Berrangé 2 years, 7 months ago
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.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/libxl/virtxend.service.in | 2 ++
 src/qemu/virtqemud.service.in | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
index a863917467..19b19ce3e6 100644
--- 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 8abc9d3a7f..20e1b43a6e 100644
--- 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
-- 
2.31.1

Re: [libvirt PATCH] qemu, xen: add missing deps on virtlockd/virtlogd sockets
Posted by Jiri Denemark 2 years, 7 months ago
On Tue, Aug 31, 2021 at 12:04:14 +0100, Daniel P. Berrangé wrote:
> 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.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  src/libxl/virtxend.service.in | 2 ++
>  src/qemu/virtqemud.service.in | 4 ++++
>  2 files changed, 6 insertions(+)

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>