| Message ID | 20170505104101.30589-5-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/05/2017 07:40 AM, Gerd Hoffmann wrote: > Code didn't check for qemu_egl_init_dpy_mesa() failures, add it. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > 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")) { >
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")) {
Code didn't check for qemu_egl_init_dpy_mesa() failures, add it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- ui/egl-helpers.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)