From patchwork Wed May 30 14:14:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CF289B702D for ; Thu, 31 May 2012 00:16:13 +1000 (EST) Received: from localhost ([::1]:52013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZjh5-0000KC-GV for incoming@patchwork.ozlabs.org; Wed, 30 May 2012 10:16:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZjgT-0007qk-5t for qemu-devel@nongnu.org; Wed, 30 May 2012 10:15:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZjgK-0007q1-Ko for qemu-devel@nongnu.org; Wed, 30 May 2012 10:15:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZjgK-0007p6-0s for qemu-devel@nongnu.org; Wed, 30 May 2012 10:15:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4UEFKM3020614 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 May 2012 10:15:20 -0400 Received: from localhost (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4UEFHPv003080; Wed, 30 May 2012 10:15:19 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 30 May 2012 11:14:57 -0300 Message-Id: <1338387301-10074-11-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1338387301-10074-1-git-send-email-lcapitulino@redhat.com> References: <1338387301-10074-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, alevy@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 10/14] omap_lcdc: omap_ppm_save(): add error handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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/omap_lcdc.c | 53 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index 3d6328f..cf5a264 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -224,18 +224,22 @@ static void omap_update_display(void *opaque) omap_lcd->invalidate = 0; } -static int omap_ppm_save(const char *filename, uint8_t *data, - int w, int h, int linesize) +static void omap_ppm_save(const char *filename, uint8_t *data, + int w, int h, int linesize, Error **errp) { FILE *f; uint8_t *d, *d1; unsigned int v; int y, x, bpp; - f = fopen(filename, "wb"); - if (!f) - return -1; - fprintf(f, "P6\n%d %d\n%d\n", w, h, 255); + f = qemu_fopen_err(filename, "wb", errp); + if (error_is_set(errp)) { + return; + } + qemu_fprintf_err(errp, f, "P6\n%d %d\n%d\n", w, h, 255); + if (error_is_set(errp)) { + goto out; + } d1 = data; bpp = linesize / w; for (y = 0; y < h; y ++) { @@ -244,24 +248,45 @@ static int omap_ppm_save(const char *filename, uint8_t *data, v = *(uint32_t *) d; switch (bpp) { case 2: - fputc((v >> 8) & 0xf8, f); - fputc((v >> 3) & 0xfc, f); - fputc((v << 3) & 0xf8, f); + qemu_fputc_err((v >> 8) & 0xf8, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v >> 3) & 0xfc, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v << 3) & 0xf8, f, errp); + if (error_is_set(errp)) { + goto out; + } break; case 3: case 4: default: - fputc((v >> 16) & 0xff, f); - fputc((v >> 8) & 0xff, f); - fputc((v) & 0xff, f); + qemu_fputc_err((v >> 16) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v >> 8) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } break; } d += bpp; } d1 += linesize; } +out: fclose(f); - return 0; + if (error_is_set(errp)) { + unlink(filename); + } } static void omap_screen_dump(void *opaque, const char *filename, bool cswitch, @@ -273,7 +298,7 @@ static void omap_screen_dump(void *opaque, const char *filename, bool cswitch, if (omap_lcd && ds_get_data(omap_lcd->state)) omap_ppm_save(filename, ds_get_data(omap_lcd->state), omap_lcd->width, omap_lcd->height, - ds_get_linesize(omap_lcd->state)); + ds_get_linesize(omap_lcd->state), errp); } static void omap_invalidate_display(void *opaque) {