locking: use & install test_libvirt_sanlock.sug for both QEMU & LibXL

The RPM specfile was referencing test_libvirt_sanlock.aug in the common
file list, for both QEMU and LibXL. This makes sense since the
sanlock.conf file is cloned for both drivers. The libvirt_sanlock.aug
file, however, was missing a reference to the LibXL copy of the config.

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.aug
index 184ea1f1817ae0ce6ac13e24632d37299a8d591f..62d0672952e9647c5082220063bdcebf112c48bf 100644 (file)
--- a/src/locking/libvirt_sanlock.aug
+++ b/src/locking/libvirt_sanlock.aug
@@ -33,6 +33,7 @@ module Libvirt_sanlock =
    let lns = ( record | comment | empty ) *
 
    let filter = incl "/etc/libvirt/qemu-sanlock.conf"
+              . incl "/etc/libvirt/libxl-sanlock.conf"
               . Util.stdexcl
 
    let xfm = transform lns filter

diff --git a/src/locking/meson.build b/src/locking/meson.build
index 934e47593b0dae35d5e876b47fa115bd899e5bc9..f8d12c481f33775bc1b399010fb1438f80ab8494 100644 (file)
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -207,6 +207,14 @@ if conf.has('WITH_LIBVIRTD')
 
   if conf.has('WITH_SANLOCK')
     virt_aug_files += files('libvirt_sanlock.aug')
+    virt_test_aug_files += {
+      'name': 'test_libvirt_sanlock.aug',
+      'aug': files('test_libvirt_sanlock.aug.in'),
+      'conf': files('sanlock.conf'),
+      'test_name': 'libvirt_sanlock',
+      'test_srcdir': meson.current_source_dir(),
+      'test_builddir': meson.current_build_dir(),
+    }
 
     if conf.has('WITH_QEMU')
       qemu_sanlock_conf = configure_file(
@@ -215,14 +223,6 @@ if conf.has('WITH_LIBVIRTD')
         configuration: configmake_conf,
       )
       virt_conf_files += qemu_sanlock_conf
-      virt_test_aug_files += {
-        'name': 'test_libvirt_sanlock.aug',
-        'aug': files('test_libvirt_sanlock.aug.in'),
-        'conf': qemu_sanlock_conf,
-        'test_name': 'libvirt_sanlock',
-        'test_srcdir': meson.current_source_dir(),
-        'test_builddir': meson.current_build_dir(),
-      }
     endif
 
     if conf.has('WITH_LIBXL')