From 2297527aaa29753784141b34a684cc105c91468b Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed, 8 Mar 2023 11:46:13 +0100
Subject: [PATCH] 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@redhat.com>
(cherry picked from commit 62b1fac0b5c5b9eeeca7a66cba6398c211acc504)
---
 hw/xwayland/xwayland.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 603e8be4f..174aed5e3 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -266,14 +266,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);
 }
 
 static const ExtensionModule xwayland_extensions[] = {