diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-05-13 21:56:54 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2014-05-13 21:56:54 -0700 |
| commit | 84c0868576b5848338cce3e01dcbc01857a7bcbd (patch) | |
| tree | 759f410e5fae6eb1cc8ccba67b47c75c7ea6684b | |
| parent | d156b07bda6cd713861ae57ac7ac4d54f11ae11f (diff) | |
| parent | 2364f2c2a793ccf545f75e4a7c66ca9a3771fa5d (diff) | |
| download | qemu-84c0868576b5848338cce3e01dcbc01857a7bcbd.tar.gz qemu-84c0868576b5848338cce3e01dcbc01857a7bcbd.tar.bz2 qemu-84c0868576b5848338cce3e01dcbc01857a7bcbd.zip | |
Merge "maru_board: set X error handler" into tizen
| -rw-r--r-- | tizen/src/hw/maru_board.c | 8 |
1 files changed, 8 insertions, 0 deletions
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) { |