[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/10] egl-helpers: add missing error check
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 06/10] egl-helpers: add missing error check |
Date: |
Fri, 12 May 2017 13:51:31 +0200 |
Code didn't check for qemu_egl_init_dpy_mesa() failures, add it.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
---
ui/egl-helpers.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index ec2e325e21..b50225158b 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -80,6 +80,7 @@ static int qemu_egl_rendernode_open(const char *rendernode)
int egl_rendernode_init(const char *rendernode)
{
qemu_egl_rn_fd = -1;
+ int rc;
qemu_egl_rn_fd = qemu_egl_rendernode_open(rendernode);
if (qemu_egl_rn_fd == -1) {
@@ -93,7 +94,11 @@ int egl_rendernode_init(const char *rendernode)
goto err;
}
- qemu_egl_init_dpy_mesa((EGLNativeDisplayType)qemu_egl_rn_gbm_dev);
+ rc = qemu_egl_init_dpy_mesa((EGLNativeDisplayType)qemu_egl_rn_gbm_dev);
+ if (rc != 0) {
+ /* qemu_egl_init_dpy_mesa reports error */
+ goto err;
+ }
if (!epoxy_has_egl_extension(qemu_egl_display,
"EGL_KHR_surfaceless_context")) {
--
2.9.3
- [Qemu-devel] [PULL 00/10] ui patch queue, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 06/10] egl-helpers: add missing error check,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 10/10] vnc: replace hweight_long() with ctpopl(), Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 02/10] ui: input-linux: Add absolute event support, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 03/10] virtio-gpu: move virtio_gpu_gl_block, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 09/10] vnc: simple clean up, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 08/10] opengl: add egl-headless display, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 07/10] egl: explicitly ask for core context, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 05/10] egl-helpers: fix display init for x11, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 04/10] egl-helpers: drop support for gles and debug logging, Gerd Hoffmann, 2017/05/12
- [Qemu-devel] [PULL 01/10] ui: Support non-zero minimum values for absolute input axes, Gerd Hoffmann, 2017/05/12
- Re: [Qemu-devel] [PULL 00/10] ui patch queue, Stefan Hajnoczi, 2017/05/15