xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 62b1fac0b5c5b9eeeca7a66cba6398c211acc504
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Mar 8 11:46:13 2023 +0100

    xwayland: Make Wayland logs non-fatal
    
    The Wayland library may log warnings, we do not need to make that fatal
    to the Xserver.
    
    By killing the Xserver whenever a warning is raised, we hide other log
    messages that might be also interesting.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index fc2b696d1..ca75ad7f1 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -289,14 +289,13 @@ wm_selection_callback(CallbackListPtr *p, void *data, void *arg)
     DeleteCallback(&SelectionCallback, wm_selection_callback, xwl_screen);
 }
 
-_X_NORETURN
 static void _X_ATTRIBUTE_PRINTF(1, 0)
 xwl_log_handler(const char *format, va_list args)
 {
     char msg[256];
 
     vsnprintf(msg, sizeof msg, format, args);
-    FatalError("%s", msg);
+    ErrorF("XWAYLAND: %s", msg);
 }
 
 #ifdef XWL_HAS_XWAYLAND_EXTENSION