100 lines
3.4 KiB
Diff
100 lines
3.4 KiB
Diff
From 26d83d4f99fbdebf9546ebb883535a85dda2fbad Mon Sep 17 00:00:00 2001
|
|
Message-Id: <26d83d4f99fbdebf9546ebb883535a85dda2fbad@dist-git>
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
Date: Wed, 4 Mar 2020 12:42:43 +0100
|
|
Subject: [PATCH] qemu: add virtiofsd_debug to qemu.conf
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
(cherry picked from commit f04319a5449974f1553458e96c2a6ee25e65ab93)
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1694166
|
|
Message-Id: <6e46af8184e9e982a6aca92a62534623795bb1fc.1583322091.git.jtomko@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@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..3014fa6b86 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 "virtiofsd_debug"
|
|
|
|
let memory_entry = str_entry "memory_backing_dir"
|
|
|
|
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
|
|
index b6805ffc41..815d2d78ae 100644
|
|
--- 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 029996427e..7aaf2862a4 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, "virtiofsd_debug", &cfg->virtiofsdDebug) < 0)
|
|
+ return -1;
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
|
|
index b9401635d7..4361f5b2bb 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 virtiofsdDebug;
|
|
|
|
char *memoryBackingDir;
|
|
|
|
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
|
|
index dd90edf687..fca9a942c9 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" }
|
|
+{ "virtiofsd_debug" = "1" }
|
|
{ "namespaces"
|
|
{ "1" = "mount" }
|
|
}
|
|
--
|
|
2.25.1
|
|
|