[libvirt PATCHv2 06/10] qemu: add virtiofs_debug to qemu.conf

[Ján Tomko]

Add a 'virtiofs_debug' option for tuning whether to run virtiofsd
in debug mode.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/libvirtd_qemu.aug         | 1 +
 src/qemu/qemu.conf                 | 7 +++++++
 src/qemu/qemu_conf.c               | 2 ++
 src/qemu/qemu_conf.h               | 1 +
 src/qemu/test_libvirtd_qemu.aug.in | 1 +
 5 files changed, 12 insertions(+)

diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 557b6f38f8..32d79f20db 100644
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -116,6 +116,7 @@ module Libvirtd_qemu =
    let nvram_entry = str_array_entry "nvram"
 
    let debug_level_entry = int_entry "gluster_debug_level"
+                 | bool_entry "virtiofs_debug"
 
    let memory_entry = str_entry "memory_backing_dir"
 
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index b6805ffc41..84f01a126d 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -809,6 +809,13 @@
 #
 #gluster_debug_level = 9
 
+# virtiofs debug
+#
+# Whether to pass the debug option to virtiofsd command line.
+# Possible values are 0 or 1.
+#
+#virtiofs_debug = 1
+
 # To enhance security, QEMU driver is capable of creating private namespaces
 # for each domain started. Well, so far only "mount" namespace is supported. If
 # enabled it means qemu process is unable to see all the devices on the system,
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index b62dd1df52..3ff02988ad 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -801,6 +801,8 @@ virQEMUDriverConfigLoadDebugEntry(virQEMUDriverConfigPtr cfg,
 {
     if (virConfGetValueUInt(conf, "gluster_debug_level", &cfg->glusterDebugLevel) < 0)
         return -1;
+    if (virConfGetValueBool(conf, "virtiofs_debug", &cfg->virtiofsDebug) < 0)
+        return -1;
 
     return 0;
 }
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index b9401635d7..4162d06bf4 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -202,6 +202,7 @@ struct _virQEMUDriverConfig {
     virFirmwarePtr *firmwares;
     size_t nfirmwares;
     unsigned int glusterDebugLevel;
+    bool virtiofsDebug;
 
     char *memoryBackingDir;
 
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index dd90edf687..7290a0004f 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -98,6 +98,7 @@ module Test_libvirtd_qemu =
 }
 { "stdio_handler" = "logd" }
 { "gluster_debug_level" = "9" }
+{ "virtiofs_debug" = "1" }
 { "namespaces"
     { "1" = "mount" }
 }
-- 
2.21.0