[libvirt] [PATCH] qemu: turn on virtlockd by default

[Daniel P. Berrange]

We have had virtlockd available for a long time now but
have always defaulted to the 'nop' lock driver which does
no locking. This gives users an unsafe deployment by
default unless they know to turn on lockd. virtlockd will
auto-activate via systemd when guests launch, so setting
it on by default will only cause upgrade pain for people
on non-systemd distros.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 src/qemu/qemu.conf     | 3 ++-
 src/qemu/qemu_driver.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 4fa5e8a..73f4a0a 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -421,7 +421,8 @@
 # share one writable disk, libvirt offers two approaches for
 # locking files. The first one is sanlock, the other one,
 # virtlockd, is then our own implementation. Accepted values
-# are "sanlock" and "lockd".
+# are "sanlock", "lockd" and "nop", with "lockd" being the
+# default.
 #
 #lock_manager = "lockd"
 
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e46404b..36fb047 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -728,7 +728,7 @@ qemuStateInitialize(bool privileged,
 
     if (!(qemu_driver->lockManager =
           virLockManagerPluginNew(cfg->lockManagerName ?
-                                  cfg->lockManagerName : "nop",
+                                  cfg->lockManagerName : "lockd",
                                   "qemu",
                                   cfg->configBaseDir,
                                   0)))
-- 
2.5.0