From: Stanislav Vorobiov Date: Tue, 13 May 2014 06:57:10 +0000 (+0400) Subject: maru_board: set X error handler X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~374^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2364f2c2a793ccf545f75e4a7c66ca9a3771fa5d;p=sdk%2Femulator%2Fqemu.git maru_board: set X error handler with VirtGL code out X error handler is not being set, so set it in board init code Change-Id: I0531e2307ae1d60bf2c0285e82eca160c95b68ee Signed-off-by: Stanislav Vorobiov --- diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c index 9dbc7e6970..1595cc4cb5 100644 --- a/tizen/src/hw/maru_board.c +++ b/tizen/src/hw/maru_board.c @@ -95,12 +95,20 @@ MemoryRegion *get_ram_memory(void) return global_ram_memory; } +#if defined(CONFIG_LINUX) +static int x_error_handler(Display *dpy, XErrorEvent *e) +{ + return 0; +} +#endif + /* maru specialized device init */ static void maru_device_init(void) { PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL); #if defined(CONFIG_LINUX) + XSetErrorHandler(x_error_handler); XInitThreads(); Display *display = XOpenDisplay(0); if (!display && !enable_spice) {