log: create subdomains for spice-gtklogs

"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
"egl"        : spice-widget-egl.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

46 files changed, 92 insertions, 2 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 68884e6..81eed02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -420,6 +420,8 @@ spice_client_glib_usb_acl_helper_SOURCES =	\
 	$(NULL)
 
 spice_client_glib_usb_acl_helper_LDADD =	\
+	$(top_builddir)/spice-common/common/libspice-common.la		\
+	$(top_builddir)/spice-common/common/libspice-common-client.la	\
 	$(GLIB2_LIBS)				\
 	$(GIO_LIBS)				\
 	$(POLKIT_LIBS)				\
@@ -428,6 +430,7 @@ spice_client_glib_usb_acl_helper_LDADD =	\
 	$(NULL)
 
 spice_client_glib_usb_acl_helper_CPPFLAGS =	\
+	$(SPICE_COMMON_CPPFLAGS)		\
 	$(SPICE_CFLAGS)				\
 	$(GLIB2_CFLAGS)				\
 	$(GIO_CFLAGS)				\
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 a41f700..dcecdd4 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 0bcf740..d9127a5 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 b2ff72c..14a6a80 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 ae62e3b..8331706 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 bc13a54..2dcaa83 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 fd3a8b8..2a1647c 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/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 730f7c4..486a514 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 cfc485c..85c35f6 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 123ef96..c7444de 100644
--- a/src/map-file
+++ b/src/map-file
@@ -144,6 +144,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 911f004..4a2e30b 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-client-glib-usb-acl-helper.c b/src/spice-client-glib-usb-acl-helper.c
index cd40b3f..106c6b4 100644
--- a/src/spice-client-glib-usb-acl-helper.c
+++ b/src/spice-client-glib-usb-acl-helper.c
@@ -22,6 +22,9 @@
 
 #include "config.h"
 
+#include "common/log.h"
+SPICE_LOG_DOMAIN_STATIC("usb")
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.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 6fbc85b..cacdbd8 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 1525d75..5ae0cd6 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 0e6161e..2651fe7 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 9d71f94..5c142da 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 a5e0d1f..494fcff 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-egl.c b/src/spice-widget-egl.c
index 545b43c..690309d 100644
--- a/src/spice-widget-egl.c
+++ b/src/spice-widget-egl.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("egl")
 
 #include <math.h>
 
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 13fe821..cbc6140 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 2642e26..2335061 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 c0c04c5..5618ec9 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>