A grab bag of changes, ranging from very much functional ones
to purely aesthetical ones.

Changes from [v1]

  * patches 01-11 from the original series have been pushed;

  * patch 40 from the original series has been dropped;

  * patches 02 (cosmetic) and 31 (bug fix) have been added;

  * the templating mechanism has been completely overhauled, and
    now uses a Python script for performing service-specific unit
    customizations instead of meson's built-in templating
    capabilities;

  * as a result of the above, service-specific customizations are now
    stored in specific foo.{service,socket}.extra.in files instead of
    meson.build;

  * various other tweaks in response to review feedback.

[v1] https://listman.redhat.com/archives/libvir-list/2023-September/242288.html

Andrea Bolognani (33):
  systemd: Drop Conflicts from virtproxyd sockets
  systemd: Introduce service_in/service_out variables
  systemd: Make @service_in@ optional
  systemd: Introduce temporary libvirtd_socket*_in values
  systemd: Provide all input files explicitly
  systemd: Introduce common templates
  systemd: Use common templates by default
  systemd: Switch virtnodedevd to common templates
  systemd: Switch virtinterfaced to common templates
  systemd: Switch virtnwfilterd to common templates
  systemd: Switch virtsecretd to common templates
  systemd: Switch virtnetworkd to common templates
  systemd: Switch virtstoraged to common templates
  systemd: Switch virtvboxd to common templates
  systemd: Switch virtvzd to common templates
  systemd: Switch virtchd to common templates
  systemd: Switch virtxend to common templates
  systemd: Switch virtlxcd to common templates
  systemd: Switch virtqemud to common templates
  systemd: Switch virtproxyd to common templates
  systemd: Drop libvirtd_socket*_in values
  systemd: Drop @deps@
  systemd: Drop parametrization from libvirtd sockets
  systemd: Make modular daemons conflict with libvirtd
  systemd: Replace Requires with BindTo+After for main socket
  systemd: Downgrade read-only/admin sockets to Wants
  systemd: Augment Requires/Wants with After
  systemd: Drop Before=libvirtd from virtlogd/virtlockd
  systemd: Drop Before=foo.service from sockets
  systemd: Add Also between sockets
  systemd: Add RemoveOnStop=yes to all sockets
  systemd: Improve and unify unit descriptions
  systemd: Move Documentation lines

 scripts/merge-systemd-units.py                | 91 +++++++++++++++++++
 scripts/meson.build                           |  1 +
 src/ch/meson.build                            |  4 +-
 src/ch/virtchd.service.extra.in               | 22 +++++
 src/ch/virtchd.service.in                     | 44 ---------
 src/interface/meson.build                     |  3 +-
 src/interface/virtinterfaced.service.in       | 25 -----
 src/libxl/meson.build                         |  6 +-
 src/libxl/virtxend.service.extra.in           | 13 +++
 src/libxl/virtxend.service.in                 | 32 -------
 src/libxl/virtxend.socket.extra.in            |  2 +
 src/locking/meson.build                       |  2 +-
 src/locking/virtlockd-admin.socket.in         |  5 +-
 src/locking/virtlockd.service.in              | 11 ++-
 src/locking/virtlockd.socket.in               |  5 +-
 src/logging/meson.build                       |  2 +-
 src/logging/virtlogd-admin.socket.in          |  5 +-
 src/logging/virtlogd.service.in               | 11 ++-
 src/logging/virtlogd.socket.in                |  5 +-
 src/lxc/meson.build                           |  4 +-
 src/lxc/virtlxcd.service.extra.in             | 22 +++++
 src/lxc/virtlxcd.service.in                   | 44 ---------
 src/meson.build                               | 41 +++++++--
 src/network/meson.build                       |  4 +-
 src/network/virtnetworkd.service.extra.in     |  2 +
 src/network/virtnetworkd.service.in           | 26 ------
 src/node_device/meson.build                   |  3 +-
 src/node_device/virtnodedevd.service.in       | 25 -----
 src/nwfilter/meson.build                      |  3 +-
 src/nwfilter/virtnwfilterd.service.in         | 25 -----
 src/qemu/meson.build                          |  4 +-
 src/qemu/virtqemud.service.extra.in           | 30 ++++++
 src/qemu/virtqemud.service.in                 | 48 ----------
 src/remote/libvirtd-admin.socket.in           | 15 +--
 src/remote/libvirtd-ro.socket.in              | 15 +--
 src/remote/libvirtd-tcp.socket.in             | 10 +-
 src/remote/libvirtd-tls.socket.in             | 10 +-
 src/remote/libvirtd.service.in                | 13 ++-
 src/remote/libvirtd.socket.in                 | 10 +-
 src/remote/meson.build                        | 13 +--
 src/remote/virtproxyd.service.in              | 25 -----
 src/secret/meson.build                        |  3 +-
 src/secret/virtsecretd.service.in             | 25 -----
 src/storage/meson.build                       |  4 +-
 src/storage/virtstoraged.service.extra.in     |  3 +
 src/storage/virtstoraged.service.in           | 27 ------
 src/vbox/meson.build                          |  4 +-
 src/vbox/virtvboxd.service.extra.in           |  2 +
 src/vbox/virtvboxd.service.in                 | 26 ------
 ...-admin.socket.in => virtd-admin.socket.in} |  9 +-
 ...bvirtd-ro.socket.in => virtd-ro.socket.in} |  9 +-
 ...irtd-tcp.socket.in => virtd-tcp.socket.in} |  6 +-
 ...irtd-tls.socket.in => virtd-tls.socket.in} |  6 +-
 src/virtd.service.in                          | 29 ++++++
 .../libvirtd.socket.in => virtd.socket.in}    |  8 +-
 src/vz/meson.build                            |  4 +-
 src/vz/virtvzd.service.extra.in               |  2 +
 src/vz/virtvzd.service.in                     | 26 ------
 58 files changed, 367 insertions(+), 507 deletions(-)
 create mode 100755 scripts/merge-systemd-units.py
 create mode 100644 src/ch/virtchd.service.extra.in
 delete mode 100644 src/ch/virtchd.service.in
 delete mode 100644 src/interface/virtinterfaced.service.in
 create mode 100644 src/libxl/virtxend.service.extra.in
 delete mode 100644 src/libxl/virtxend.service.in
 create mode 100644 src/libxl/virtxend.socket.extra.in
 create mode 100644 src/lxc/virtlxcd.service.extra.in
 delete mode 100644 src/lxc/virtlxcd.service.in
 create mode 100644 src/network/virtnetworkd.service.extra.in
 delete mode 100644 src/network/virtnetworkd.service.in
 delete mode 100644 src/node_device/virtnodedevd.service.in
 delete mode 100644 src/nwfilter/virtnwfilterd.service.in
 create mode 100644 src/qemu/virtqemud.service.extra.in
 delete mode 100644 src/qemu/virtqemud.service.in
 delete mode 100644 src/remote/virtproxyd.service.in
 delete mode 100644 src/secret/virtsecretd.service.in
 create mode 100644 src/storage/virtstoraged.service.extra.in
 delete mode 100644 src/storage/virtstoraged.service.in
 create mode 100644 src/vbox/virtvboxd.service.extra.in
 delete mode 100644 src/vbox/virtvboxd.service.in
 copy src/{remote/libvirtd-admin.socket.in => virtd-admin.socket.in} (54%)
 copy src/{remote/libvirtd-ro.socket.in => virtd-ro.socket.in} (53%)
 copy src/{remote/libvirtd-tcp.socket.in => virtd-tcp.socket.in} (57%)
 copy src/{remote/libvirtd-tls.socket.in => virtd-tls.socket.in} (58%)
 create mode 100644 src/virtd.service.in
 copy src/{remote/libvirtd.socket.in => virtd.socket.in} (54%)
 create mode 100644 src/vz/virtvzd.service.extra.in
 delete mode 100644 src/vz/virtvzd.service.in

-- 
2.41.0