Add option to disable debug logs of libvirtaio

The root level and handlers can have the log level debug, but libvirt is
too verbose for that. Disabling it makes the output easier to read.
Especially considering the previous commit that allows logging dom0
qrexec calls, when in debug mode.

Author: ben-grande

qubes/log.py

@@ -43,7 +43,7 @@ def formatMessage(self, record):
         return fmt % record.__dict__
 
 
-def enable(log_level: int = logging.INFO):
+def enable(log_level: int = logging.INFO, disable_debug_libvirt: bool = False):
     """Enable global logging
 
     Use :py:mod:`logging` module from standard library to log messages.
@@ -64,6 +64,8 @@ def enable(log_level: int = logging.INFO):
     if log_level == logging.DEBUG:
         for handler in logging.root.handlers:
             handler.setFormatter(Formatter(debug=True))
+        if disable_debug_libvirt:
+            logging.getLogger("virEventAsyncIOImpl").setLevel(logging.INFO)
     logging.root.setLevel(log_level)
 
 

qubes/tools/__init__.py

@@ -475,6 +475,15 @@ def set_qubes_verbosity(namespace):
         This is done by configuring global logging.
         :param argparse.Namespace args: args as parsed by parser
         """
+        if namespace.debug:
+            qubes.log.enable(
+                log_level=logging.DEBUG,
+                disable_debug_libvirt=getattr(
+                    namespace, "disable_debug_libvirt", False
+                ),
+            )
+            return
+
         verbose = namespace.verbose - namespace.quiet
         levels = [logging.NOTSET, logging.INFO, logging.DEBUG]
         log_level = levels[min(verbose, 2)]

qubes/tools/qubesd.py

@@ -38,6 +38,13 @@ def sighandler(loop, signame, servers, app):
     help="Enable verbose error logging (all exceptions with full "
     "tracebacks) and also send tracebacks to Admin API clients",
 )
+parser.add_argument(
+    "--disable-debug-libvirt",
+    action="store_true",
+    default=False,
+    help="Disables verbose logging of libvirtaio, specifically the "
+    "virEventAsyncIOImpl handler",
+)
 parser.add_argument(
     "--log-dom0-call",
     action="store_true",
@@ -60,9 +67,6 @@ def main(args=None):
     # Stop storage for domains not currently running
     loop.run_until_complete(args.app.stop_storage())
 
-    if args.debug:
-        qubes.log.enable(log_level=10)
-
     servers = loop.run_until_complete(
         qubes.api.create_servers(
             qubes.api.admin.QubesAdminAPI,