From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OY-0006yL-68 for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY0OW-0004h2-9P for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OW-0004eU-1D for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:52 -0400 From: Luiz Capitulino Date: Fri, 25 May 2012 16:41:17 -0300 Message-Id: <1337974879-3656-13-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> References: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 12/14] tcx: tcx24_screen_dump(): add error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, alevy@redhat.com, armbru@redhat.com This is done by using qemu_fopen_err(), qemu_fputc_err() and handling errors appropriately (eg. removing the screendump file if the operation fails). Note that the error is not passed up yet, as vga_hw_screen_dump() still calls consoles[0]->hw_screen_dump() with errp=NULL. The error will be propagated up when screendump is converted to the QAPI. That will be done by a later commit. Signed-off-by: Luiz Capitulino --- hw/tcx.c | 50 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/hw/tcx.c b/hw/tcx.c index 74a7085..4027363 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -613,10 +613,14 @@ static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch, uint32_t *s24, *cptr, dval; int y, x; - f = fopen(filename, "wb"); - if (!f) + f = qemu_fopen_err(filename, "wb", errp); + if (error_is_set(errp)) { return; - fprintf(f, "P6\n%d %d\n%d\n", s->width, s->height, 255); + } + qemu_fprintf_err(errp, f, "P6\n%d %d\n%d\n", s->width, s->height, 255); + if (error_is_set(errp)) { + goto out; + } d1 = s->vram; s24 = s->vram24; cptr = s->cplane; @@ -625,20 +629,46 @@ static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch, for(x = 0; x < s->width; x++, d++, s24++) { if ((*cptr++ & 0xff000000) == 0x03000000) { // 24-bit direct dval = *s24 & 0x00ffffff; - fputc((dval >> 16) & 0xff, f); - fputc((dval >> 8) & 0xff, f); - fputc(dval & 0xff, f); + qemu_fputc_err((dval >> 16) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } + + qemu_fputc_err((dval >> 8) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } + + qemu_fputc_err(dval & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } } else { v = *d; - fputc(s->r[v], f); - fputc(s->g[v], f); - fputc(s->b[v], f); + qemu_fputc_err(s->r[v], f, errp); + if (error_is_set(errp)) { + goto out; + } + + qemu_fputc_err(s->g[v], f, errp); + if (error_is_set(errp)) { + goto out; + } + + qemu_fputc_err(s->b[v], f, errp); + if (error_is_set(errp)) { + goto out; + } } } d1 += MAXX; } + +out: fclose(f); - return; + if (error_is_set(errp)) { + unlink(filename); + } } static Property tcx_properties[] = { -- 1.7.10.2.565.gbd578b5