qemu: add virtiofsd_debug to qemu.conf

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

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Tested-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 557b6f38f8b0d77b774ba223e2d93aa301841637..3014fa6b86c63ec8c96103f0b43c6e61d85c8a5d 100644 (file)
--- 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 "virtiofsd_debug"
 
    let memory_entry = str_entry "memory_backing_dir"
 

diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index b6805ffc415da4e0380d63a3837dd6dd1dc21eb0..815d2d78aef5c9f35d41adc532b4cfd71c62d7cb 100644 (file)
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -809,6 +809,13 @@
 #
 #gluster_debug_level = 9
 
+# virtiofsd debug
+#
+# Whether to enable the debugging output of the virtiofsd daemon.
+# Possible values are 0 or 1. Disabled by default.
+#
+#virtiofsd_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 eeb29f46bd29f640b09b1822566ffac11971d4a9..17a6eb3422295d8652afc8a326ca2c42a499d898 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -836,6 +836,8 @@ virQEMUDriverConfigLoadDebugEntry(virQEMUDriverConfigPtr cfg,
 {
     if (virConfGetValueUInt(conf, "gluster_debug_level", &cfg->glusterDebugLevel) < 0)
         return -1;
+    if (virConfGetValueBool(conf, "virtiofsd_debug", &cfg->virtiofsdDebug) < 0)
+        return -1;
 
     return 0;
 }

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index cedf232223d36230d1f352216e99fa32ca95fa98..3ce9566b7168463546abe73dd11fda17490bd361 100644 (file)
--- 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 virtiofsdDebug;
 
     char *memoryBackingDir;
 

diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index dd90edf687a82dcf0f3088eb199e3821dd539521..fca9a942c9d5b6001cd8c535898f151b5d53d306 100644 (file)
--- 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" }
+{ "virtiofsd_debug" = "1" }
 { "namespaces"
     { "1" = "mount" }
 }