[spice-gtk PATCH v2 17/17] log: use specific subdomains for better filtering

[Victor Toso <victortoso@xxxxxxxxxx>]

spice-gtk subdomains created in this patch are:
"audio"      : spice-audio.c spice-gstaudio.c spice-pulse.c
"base"       : channel-base.c
"channel"    : spice-channel.c
"coroutine"  : coroutine_gthread.c coroutine_ucontext.c
               coroutine_winfibers.c
"cursor"     : channel-cursor.c
"decode"     : decode-glz.c decode-jpeg.c decode-zlib.c
"display"    : channel-display.c channel-display-mjpeg.c
"giopipe"    : giopipe.c
"gtk-session": spice-gtk-session.c
"input"      : channel-inputs.c
"log"        : bio-gio.c continuation.c desktop-integration.c
               spice-option.c spice-grabsequence.c spice-uri.c
               spice-util.c
"main"       : channel-main.c
"playback"   : channel-playback.c
"port"       : channel-port.c
"record"     : channel-record.c
"session"    : spice-session.c
"smartcard"  : channel-smartcard.c smartcard-manager.c
"usbredir"   : channel-usbredir.c
"usb"        : usb-device-manager.c usb-device-widget.c usbutil.c
               win-usb-dev.c win-usb-driver-install.c
"vmcstream"  : vmcstream.c
"vnc-keymap" : vncdisplaykeymap.c
"webdav"     : channel-webdav.c
"widget"     : spice-widget.c

Related: https://bugs.freedesktop.org/show_bug.cgi?id=91838
---
 src/bio-gio.c                | 2 ++
 src/channel-base.c           | 2 ++
 src/channel-cursor.c         | 2 ++
 src/channel-display-mjpeg.c  | 2 ++
 src/channel-display.c        | 2 ++
 src/channel-inputs.c         | 2 ++
 src/channel-main.c           | 2 ++
 src/channel-playback.c       | 2 ++
 src/channel-port.c           | 2 ++
 src/channel-record.c         | 2 ++
 src/channel-smartcard.c      | 2 ++
 src/channel-usbredir.c       | 2 ++
 src/channel-webdav.c         | 2 ++
 src/continuation.c           | 1 +
 src/coroutine.h              | 1 -
 src/coroutine_gthread.c      | 2 ++
 src/coroutine_ucontext.c     | 3 +++
 src/coroutine_winfibers.c    | 3 +++
 src/decode-glz.c             | 2 ++
 src/decode-jpeg.c            | 2 ++
 src/decode-zlib.c            | 2 ++
 src/desktop-integration.c    | 2 ++
 src/giopipe.c                | 3 +++
 src/map-file                 | 1 +
 src/smartcard-manager.c      | 2 ++
 src/spice-audio.c            | 2 ++
 src/spice-channel.c          | 2 ++
 src/spice-common.h           | 1 -
 src/spice-grabsequence.c     | 1 +
 src/spice-gstaudio.c         | 2 ++
 src/spice-gtk-session.c      | 2 ++
 src/spice-option.c           | 2 ++
 src/spice-pulse.c            | 2 ++
 src/spice-session.c          | 2 ++
 src/spice-uri.c              | 2 ++
 src/spice-util.c             | 2 ++
 src/spice-util.h             | 1 -
 src/spice-widget.c           | 2 ++
 src/usb-device-manager.c     | 2 ++
 src/usb-device-widget.c      | 3 +++
 src/usbutil.c                | 2 ++
 src/vmcstream.c              | 2 ++
 src/vncdisplaykeymap.c       | 2 ++
 src/win-usb-dev.c            | 2 ++
 src/win-usb-driver-install.c | 2 ++
 45 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/src/bio-gio.c b/src/bio-gio.c
index 04d6613..c8d2a89 100644
--- a/src/bio-gio.c
+++ b/src/bio-gio.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("log");
 
 #include <string.h>
 #include <glib.h>
diff --git a/src/channel-base.c b/src/channel-base.c
index 29163dc..7cf2646 100644
--- a/src/channel-base.c
+++ b/src/channel-base.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("base");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/channel-cursor.c b/src/channel-cursor.c
index a49fcf8..a73c83c 100644
--- a/src/channel-cursor.c
+++ b/src/channel-cursor.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("cursor");
 
 #include "glib-compat.h"
 #include "spice-client.h"
diff --git a/src/channel-display-mjpeg.c b/src/channel-display-mjpeg.c
index 0c1f2f1..f7815a6 100644
--- a/src/channel-display-mjpeg.c
+++ b/src/channel-display-mjpeg.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("display");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/channel-display.c b/src/channel-display.c
index 3eb7952..c6f5f0e 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("display");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/channel-inputs.c b/src/channel-inputs.c
index 94d4d0f..5cc6f5f 100644
--- a/src/channel-inputs.c
+++ b/src/channel-inputs.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("input");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/channel-main.c b/src/channel-main.c
index 77a96a3..d1a1f60 100644
--- a/src/channel-main.c
+++ b/src/channel-main.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("main");
 
 #include <math.h>
 #include <spice/vd_agent.h>
diff --git a/src/channel-playback.c b/src/channel-playback.c
index be79868..dd81f7e 100644
--- a/src/channel-playback.c
+++ b/src/channel-playback.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("playback");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/channel-port.c b/src/channel-port.c
index 6e01caa..ed76d3a 100644
--- a/src/channel-port.c
+++ b/src/channel-port.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("port");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/channel-record.c b/src/channel-record.c
index 1a17a0d..1e92134 100644
--- a/src/channel-record.c
+++ b/src/channel-record.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("record");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/channel-smartcard.c b/src/channel-smartcard.c
index 8f29531..9e9b78d 100644
--- a/src/channel-smartcard.c
+++ b/src/channel-smartcard.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("smartcard");
 
 #ifdef USE_SMARTCARD_012
 #include <vreader.h>
diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
index 418f32a..0bb906c 100644
--- a/src/channel-usbredir.c
+++ b/src/channel-usbredir.c
@@ -20,6 +20,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("usbredir");
 
 #ifdef USE_USBREDIR
 #include <glib/gi18n.h>
diff --git a/src/channel-webdav.c b/src/channel-webdav.c
index 2a3e2f1..65b85d6 100644
--- a/src/channel-webdav.c
+++ b/src/channel-webdav.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("webdav");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/continuation.c b/src/continuation.c
index 1cdd0d1..d53a4b9 100644
--- a/src/continuation.c
+++ b/src/continuation.c
@@ -29,6 +29,7 @@
 
 #include "continuation.h"
 #include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("log");
 
 /*
  * va_args to makecontext() must be type 'int', so passing
diff --git a/src/coroutine.h b/src/coroutine.h
index c9694a8..78dc467 100644
--- a/src/coroutine.h
+++ b/src/coroutine.h
@@ -22,7 +22,6 @@
 #define _COROUTINE_H_
 
 #include "config.h"
-#include "common/log.h"
 
 #if WITH_UCONTEXT
 #include "continuation.h"
diff --git a/src/coroutine_gthread.c b/src/coroutine_gthread.c
index 5c61423..57b3816 100644
--- a/src/coroutine_gthread.c
+++ b/src/coroutine_gthread.c
@@ -19,6 +19,8 @@
  */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("coroutine");
 
 #include "coroutine.h"
 #include <stdio.h>
diff --git a/src/coroutine_ucontext.c b/src/coroutine_ucontext.c
index 2ad2465..39099a6 100644
--- a/src/coroutine_ucontext.c
+++ b/src/coroutine_ucontext.c
@@ -19,6 +19,9 @@
  */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("coroutine");
+
 #include <glib.h>
 
 #ifdef HAVE_SYS_TYPES_H
diff --git a/src/coroutine_winfibers.c b/src/coroutine_winfibers.c
index ef07c1c..5c49ce3 100644
--- a/src/coroutine_winfibers.c
+++ b/src/coroutine_winfibers.c
@@ -19,6 +19,9 @@
  */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("coroutine");
+
 #include <stdio.h>
 #include <glib.h>
 
diff --git a/src/decode-glz.c b/src/decode-glz.c
index 9696af9..487baa7 100644
--- a/src/decode-glz.c
+++ b/src/decode-glz.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("decode");
 
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/src/decode-jpeg.c b/src/decode-jpeg.c
index 694178f..0f165bf 100644
--- a/src/decode-jpeg.c
+++ b/src/decode-jpeg.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("decode");
 
 #include "decode.h"
 
diff --git a/src/decode-zlib.c b/src/decode-zlib.c
index d49ce46..feff20e 100644
--- a/src/decode-zlib.c
+++ b/src/decode-zlib.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("decode");
 
 #include "decode.h"
 
diff --git a/src/desktop-integration.c b/src/desktop-integration.c
index db99a9b..e1d6b54 100644
--- a/src/desktop-integration.c
+++ b/src/desktop-integration.c
@@ -20,6 +20,8 @@
 */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("log");
 
 #include <glib-object.h>
 
diff --git a/src/giopipe.c b/src/giopipe.c
index 77de1cf..7fe19f8 100644
--- a/src/giopipe.c
+++ b/src/giopipe.c
@@ -17,6 +17,9 @@
 */
 
 #include <string.h>
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("giopipe");
+
 #include <errno.h>
 
 #include "giopipe.h"
diff --git a/src/map-file b/src/map-file
index 62cdb51..a94ecb3 100644
--- a/src/map-file
+++ b/src/map-file
@@ -140,6 +140,7 @@ spice_util_get_version_string;
 spice_util_set_debug;
 spice_uuid_to_string;
 spice_webdav_channel_get_type;
+spice_log;
 local:
 *;
 };
diff --git a/src/smartcard-manager.c b/src/smartcard-manager.c
index faed363..4e4159c 100644
--- a/src/smartcard-manager.c
+++ b/src/smartcard-manager.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("smartcard");
 
 #include <glib-object.h>
 #include <string.h>
diff --git a/src/spice-audio.c b/src/spice-audio.c
index 8d9c30a..48acd2c 100644
--- a/src/spice-audio.c
+++ b/src/spice-audio.c
@@ -33,6 +33,8 @@
  */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("audio");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/spice-channel.c b/src/spice-channel.c
index 06dafcb..dd3ffd4 100644
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("channel");
 
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/spice-common.h b/src/spice-common.h
index edca065..8554f4c 100644
--- a/src/spice-common.h
+++ b/src/spice-common.h
@@ -30,7 +30,6 @@
 #include "common/mem.h"
 #include "common/messages.h"
 #include "common/marshaller.h"
-#include "common/log.h"
 
 #include "spice-util.h"
 
diff --git a/src/spice-grabsequence.c b/src/spice-grabsequence.c
index 0b2ad03..a3ae726 100644
--- a/src/spice-grabsequence.c
+++ b/src/spice-grabsequence.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("log");
 
 #include <string.h>
 #include <gdk/gdk.h>
diff --git a/src/spice-gstaudio.c b/src/spice-gstaudio.c
index c172692..30c3afc 100644
--- a/src/spice-gstaudio.c
+++ b/src/spice-gstaudio.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("audio");
 
 #include <gst/gst.h>
 #include <gst/app/gstappsrc.h>
diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
index 516dba8..8ede072 100644
--- a/src/spice-gtk-session.c
+++ b/src/spice-gtk-session.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("gtk-session");
 
 #include <glib.h>
 
diff --git a/src/spice-option.c b/src/spice-option.c
index 51ec801..efec4f2 100644
--- a/src/spice-option.c
+++ b/src/spice-option.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("log");
 
 #include <stdlib.h>
 #include <glib-object.h>
diff --git a/src/spice-pulse.c b/src/spice-pulse.c
index b0f7b28..da7b1a9 100644
--- a/src/spice-pulse.c
+++ b/src/spice-pulse.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("audio");
 
 #include "spice-pulse.h"
 #include "spice-common.h"
diff --git a/src/spice-session.c b/src/spice-session.c
index 51d86aa..38566c0 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("session");
 
 #include <gio/gio.h>
 #include <glib.h>
diff --git a/src/spice-uri.c b/src/spice-uri.c
index e2c5c9a..3152abb 100644
--- a/src/spice-uri.c
+++ b/src/spice-uri.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("log");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/spice-util.c b/src/spice-util.c
index d4b881d..c5392ce 100644
--- a/src/spice-util.c
+++ b/src/spice-util.c
@@ -17,6 +17,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("log");
 
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/src/spice-util.h b/src/spice-util.h
index 26a2264..d41140d 100644
--- a/src/spice-util.h
+++ b/src/spice-util.h
@@ -18,7 +18,6 @@
 #ifndef SPICE_UTIL_H
 #define SPICE_UTIL_H
 
-#include "common/log.h"
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 9c91ae7..68a70d3 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -16,6 +16,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("widget");
 
 #include <math.h>
 #include <glib.h>
diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
index 95f7d78..1377593 100644
--- a/src/usb-device-manager.c
+++ b/src/usb-device-manager.c
@@ -20,6 +20,8 @@
 */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("usb");
 
 #include <glib-object.h>
 
diff --git a/src/usb-device-widget.c b/src/usb-device-widget.c
index d757698..ec270fc 100644
--- a/src/usb-device-widget.c
+++ b/src/usb-device-widget.c
@@ -20,6 +20,9 @@
 */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("usb");
+
 #include <glib/gi18n.h>
 #include "glib-compat.h"
 #include "spice-client.h"
diff --git a/src/usbutil.c b/src/usbutil.c
index 38ac921..93ce60f 100644
--- a/src/usbutil.c
+++ b/src/usbutil.c
@@ -20,6 +20,8 @@
 */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("usb");
 
 #include <glib-object.h>
 #include <glib/gi18n.h>
diff --git a/src/vmcstream.c b/src/vmcstream.c
index 8f40b92..0a6c5ca 100644
--- a/src/vmcstream.c
+++ b/src/vmcstream.c
@@ -16,6 +16,8 @@
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("vmcstream");
 
 #include <string.h>
 
diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
index 7809ae4..33502f3 100644
--- a/src/vncdisplaykeymap.c
+++ b/src/vncdisplaykeymap.c
@@ -8,6 +8,8 @@
  *
  */
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("vnc-keymap");
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
diff --git a/src/win-usb-dev.c b/src/win-usb-dev.c
index 3bdd697..daee44c 100644
--- a/src/win-usb-dev.c
+++ b/src/win-usb-dev.c
@@ -21,6 +21,8 @@
 */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("usb");
 
 #include <windows.h>
 #include <libusb.h>
diff --git a/src/win-usb-driver-install.c b/src/win-usb-driver-install.c
index 7bfb6d6..bcef917 100644
--- a/src/win-usb-driver-install.c
+++ b/src/win-usb-driver-install.c
@@ -26,6 +26,8 @@
  */
 
 #include "config.h"
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("usb");
 
 #include <windows.h>
 #include <gio/gio.h>
-- 
2.5.0

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel