systemd: Drop unnecessary uses of @sockprefix@

Now that providing the value is optional, we can remove almost
all uses.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

src/ch/meson.build

@@ -59,7 +59,6 @@ if conf.has('WITH_CH')
     'service': 'virtchd',
     'service_in': files('virtchd.service.in'),
     'name': 'Libvirt ch',
-    'sockprefix': 'virtchd',
   }
 
   virt_install_dirs += [

src/interface/meson.build

@@ -46,7 +46,6 @@ if conf.has('WITH_INTERFACE')
     'service': 'virtinterfaced',
     'service_in': files('virtinterfaced.service.in'),
     'name': 'Libvirt interface',
-    'sockprefix': 'virtinterfaced',
   }
 
   openrc_init_files += {

src/libxl/meson.build

@@ -68,7 +68,6 @@ if conf.has('WITH_LIBXL')
     'service': 'virtxend',
     'service_in': files('virtxend.service.in'),
     'name': 'Libvirt libxl',
-    'sockprefix': 'virtxend',
     'deps': 'ConditionPathExists=/proc/xen/capabilities',
   }
 

src/locking/meson.build

@@ -145,7 +145,6 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlockd',
     'service_in': files('virtlockd.service.in'),
     'name': 'Libvirt locking',
-    'sockprefix': '',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlockd.socket.in'),
     'socket_admin_in': files('virtlockd-admin.socket.in'),

src/logging/meson.build

@@ -92,7 +92,6 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlogd',
     'service_in': files('virtlogd.service.in'),
     'name': 'Libvirt logging',
-    'sockprefix': '',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlogd.socket.in'),
     'socket_admin_in': files('virtlogd-admin.socket.in'),

src/lxc/meson.build

@@ -166,7 +166,6 @@ if conf.has('WITH_LXC')
     'service': 'virtlxcd',
     'service_in': files('virtlxcd.service.in'),
     'name': 'Libvirt lxc',
-    'sockprefix': 'virtlxcd',
   }
 
   openrc_init_files += {

src/network/meson.build

@@ -64,7 +64,6 @@ if conf.has('WITH_NETWORK')
     'service': 'virtnetworkd',
     'service_in': files('virtnetworkd.service.in'),
     'name': 'Libvirt network',
-    'sockprefix': 'virtnetworkd',
   }
 
   openrc_init_files += {

src/node_device/meson.build

@@ -54,7 +54,6 @@ if conf.has('WITH_NODE_DEVICES')
     'service': 'virtnodedevd',
     'service_in': files('virtnodedevd.service.in'),
     'name': 'Libvirt nodedev',
-    'sockprefix': 'virtnodedevd',
   }
 
   openrc_init_files += {

src/nwfilter/meson.build

@@ -52,7 +52,6 @@ if conf.has('WITH_NWFILTER')
     'service': 'virtnwfilterd',
     'service_in': files('virtnwfilterd.service.in'),
     'name': 'Libvirt nwfilter',
-    'sockprefix': 'virtnwfilterd',
   }
 
   openrc_init_files += {

src/qemu/meson.build

@@ -185,7 +185,6 @@ if conf.has('WITH_QEMU')
     'service': 'virtqemud',
     'service_in': files('virtqemud.service.in'),
     'name': 'Libvirt qemu',
-    'sockprefix': 'virtqemud',
   }
 
   openrc_init_files += {

src/secret/meson.build

@@ -35,7 +35,6 @@ if conf.has('WITH_SECRETS')
     'service': 'virtsecretd',
     'service_in': files('virtsecretd.service.in'),
     'name': 'Libvirt secret',
-    'sockprefix': 'virtsecretd',
   }
 
   openrc_init_files += {

src/storage/meson.build

@@ -113,7 +113,6 @@ if conf.has('WITH_STORAGE')
     'service': 'virtstoraged',
     'service_in': files('virtstoraged.service.in'),
     'name': 'Libvirt storage',
-    'sockprefix': 'virtstoraged',
   }
 
   openrc_init_files += {

src/vbox/meson.build

@@ -59,7 +59,6 @@ if conf.has('WITH_VBOX')
     'service': 'virtvboxd',
     'service_in': files('virtvboxd.service.in'),
     'name': 'Libvirt vbox',
-    'sockprefix': 'virtvboxd',
   }
 
   openrc_init_files += {

src/vz/meson.build

@@ -50,7 +50,6 @@ if conf.has('WITH_VZ')
     'service': 'virtvzd',
     'service_in': files('virtvzd.service.in'),
     'name': 'Libvirt vz',
-    'sockprefix': 'virtvzd',
   }
 
   openrc_init_files += {