From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8j9u-0003pR-J0 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:04:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8j9n-0006Kt-D4 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:04:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8j9n-0006K9-5E for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:04:35 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 601AF4DBA9 for ; Fri, 3 Jun 2016 07:04:34 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 3 Jun 2016 09:04:22 +0200 Message-Id: <1464937468-14816-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1464937468-14816-1-git-send-email-kraxel@redhat.com> References: <1464937468-14816-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/7] ui: egl: Replace fprintf with error_report List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cole Robinson , Gerd Hoffmann From: Cole Robinson Signed-off-by: Cole Robinson Reviewed-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: c880920f6e40a506394d89dbbe1f67c63d359c17.1463588606.git.crobi= nso@redhat.com Signed-off-by: Gerd Hoffmann --- ui/egl-helpers.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 22835c0..79cee05 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -2,6 +2,7 @@ #include #include =20 +#include "qemu/error-report.h" #include "ui/egl-helpers.h" =20 EGLDisplay *qemu_egl_display; @@ -74,13 +75,13 @@ int egl_rendernode_init(void) =20 qemu_egl_rn_fd =3D qemu_egl_rendernode_open(); if (qemu_egl_rn_fd =3D=3D -1) { - fprintf(stderr, "egl: no drm render node available\n"); + error_report("egl: no drm render node available"); goto err; } =20 qemu_egl_rn_gbm_dev =3D gbm_create_device(qemu_egl_rn_fd); if (!qemu_egl_rn_gbm_dev) { - fprintf(stderr, "egl: gbm_create_device failed\n"); + error_report("egl: gbm_create_device failed"); goto err; } =20 @@ -88,18 +89,18 @@ int egl_rendernode_init(void) =20 if (!epoxy_has_egl_extension(qemu_egl_display, "EGL_KHR_surfaceless_context")) { - fprintf(stderr, "egl: EGL_KHR_surfaceless_context not supported\= n"); + error_report("egl: EGL_KHR_surfaceless_context not supported"); goto err; } if (!epoxy_has_egl_extension(qemu_egl_display, "EGL_MESA_image_dma_buf_export")) { - fprintf(stderr, "egl: EGL_MESA_image_dma_buf_export not supporte= d\n"); + error_report("egl: EGL_MESA_image_dma_buf_export not supported")= ; goto err; } =20 qemu_egl_rn_ctx =3D qemu_egl_init_ctx(); if (!qemu_egl_rn_ctx) { - fprintf(stderr, "egl: egl_init_ctx failed\n"); + error_report("egl: egl_init_ctx failed"); goto err; } =20 @@ -156,13 +157,13 @@ EGLSurface qemu_egl_init_surface_x11(EGLContext ect= x, Window win) qemu_egl_config, (EGLNativeWindowType)win, NULL); if (esurface =3D=3D EGL_NO_SURFACE) { - fprintf(stderr, "egl: eglCreateWindowSurface failed\n"); + error_report("egl: eglCreateWindowSurface failed"); return NULL; } =20 b =3D eglMakeCurrent(qemu_egl_display, esurface, esurface, ectx); if (b =3D=3D EGL_FALSE) { - fprintf(stderr, "egl: eglMakeCurrent failed\n"); + error_report("egl: eglMakeCurrent failed"); return NULL; } =20 @@ -204,21 +205,21 @@ int qemu_egl_init_dpy(EGLNativeDisplayType dpy, boo= l gles, bool debug) egl_dbg("eglGetDisplay (dpy %p) ...\n", dpy); qemu_egl_display =3D eglGetDisplay(dpy); if (qemu_egl_display =3D=3D EGL_NO_DISPLAY) { - fprintf(stderr, "egl: eglGetDisplay failed\n"); + error_report("egl: eglGetDisplay failed"); return -1; } =20 egl_dbg("eglInitialize ...\n"); b =3D eglInitialize(qemu_egl_display, &major, &minor); if (b =3D=3D EGL_FALSE) { - fprintf(stderr, "egl: eglInitialize failed\n"); + error_report("egl: eglInitialize failed"); return -1; } =20 egl_dbg("eglBindAPI ...\n"); b =3D eglBindAPI(gles ? EGL_OPENGL_ES_API : EGL_OPENGL_API); if (b =3D=3D EGL_FALSE) { - fprintf(stderr, "egl: eglBindAPI failed\n"); + error_report("egl: eglBindAPI failed"); return -1; } =20 @@ -227,7 +228,7 @@ int qemu_egl_init_dpy(EGLNativeDisplayType dpy, bool = gles, bool debug) gles ? conf_att_gles : conf_att_gl, &qemu_egl_config, 1, &n); if (b =3D=3D EGL_FALSE || n !=3D 1) { - fprintf(stderr, "egl: eglChooseConfig failed\n"); + error_report("egl: eglChooseConfig failed"); return -1; } =20 @@ -252,13 +253,13 @@ EGLContext qemu_egl_init_ctx(void) ectx =3D eglCreateContext(qemu_egl_display, qemu_egl_config, EGL_NO_= CONTEXT, egl_gles ? ctx_att_gles : ctx_att_gl); if (ectx =3D=3D EGL_NO_CONTEXT) { - fprintf(stderr, "egl: eglCreateContext failed\n"); + error_report("egl: eglCreateContext failed"); return NULL; } =20 b =3D eglMakeCurrent(qemu_egl_display, EGL_NO_SURFACE, EGL_NO_SURFAC= E, ectx); if (b =3D=3D EGL_FALSE) { - fprintf(stderr, "egl: eglMakeCurrent failed\n"); + error_report("egl: eglMakeCurrent failed"); return NULL; } =20 --=20 1.8.3.1