[libvirt PATCH 5/5] qemu: Update documentation for qemu.conf keys
Reflect the new default value, and explain that a runtime
lookup will be performed if the value is not an absolute path.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/qemu/qemu.conf.in | 8 ++++++--
src/qemu/test_libvirtd_qemu.aug.in | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in
index 3895d42514..e1a9a5e56d 100644
--- a/src/qemu/qemu.conf.in
+++ b/src/qemu/qemu.conf.in
@@ -650,7 +650,9 @@
# is used to create <source type='bridge'> interfaces when libvirtd is
# running unprivileged. libvirt invokes the helper directly, instead
# of using "-netdev bridge", for security reasons.
-#bridge_helper = "/usr/libexec/qemu-bridge-helper"
+# If this is not an absolute path, the program will be searched for
+# in $PATH as well as a few additional directories.
+#bridge_helper = "qemu-bridge-helper"
# If enabled, libvirt will have QEMU set its process name to
@@ -899,7 +901,9 @@
# Path to the SCSI persistent reservations helper. This helper is
# used whenever <reservations/> are enabled for SCSI LUN devices.
-#pr_helper = "/usr/bin/qemu-pr-helper"
+# If this is not an absolute path, the program will be searched for
+# in $PATH as well as a few additional directories.
+#pr_helper = "qemu-pr-helper"
# Path to the SLIRP networking helper.
#slirp_helper = "/usr/bin/slirp-helper"
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index 1dbd692921..af99331886 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -75,7 +75,7 @@ module Test_libvirtd_qemu =
{ "auto_dump_bypass_cache" = "0" }
{ "auto_start_bypass_cache" = "0" }
{ "hugetlbfs_mount" = "/dev/hugepages" }
-{ "bridge_helper" = "/usr/libexec/qemu-bridge-helper" }
+{ "bridge_helper" = "qemu-bridge-helper" }
{ "set_process_name" = "1" }
{ "max_processes" = "0" }
{ "max_files" = "0" }
@@ -107,7 +107,7 @@ module Test_libvirtd_qemu =
{ "1" = "mount" }
}
{ "memory_backing_dir" = "/var/lib/libvirt/qemu/ram" }
-{ "pr_helper" = "/usr/bin/qemu-pr-helper" }
+{ "pr_helper" = "qemu-pr-helper" }
{ "slirp_helper" = "/usr/bin/slirp-helper" }
{ "dbus_daemon" = "/usr/bin/dbus-daemon" }
{ "swtpm_user" = "tss" }
--
2.40.1