From patchwork Fri May 25 19:41:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161410 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 875FAB72B3 for ; Sat, 26 May 2012 06:05:58 +1000 (EST) Received: from localhost ([::1]:57193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0lo-00065b-CP for incoming@patchwork.ozlabs.org; Fri, 25 May 2012 16:05:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0Ob-00078b-AJ for qemu-devel@nongnu.org; Fri, 25 May 2012 15:42:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY0OZ-0004k0-Cf for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OZ-0004jU-43 for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:55 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJfr5P010498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 May 2012 15:41:53 -0400 Received: from localhost (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJfphI002127; Fri, 25 May 2012 15:41:52 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 16:41:18 -0300 Message-Id: <1337974879-3656-14-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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 13/14] tcx: tcx_screen_dump(): 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/tcx.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/hw/tcx.c b/hw/tcx.c index 4027363..7aa1abe 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -584,24 +584,44 @@ static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch, uint8_t *d, *d1, v; 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; for(y = 0; y < s->height; y++) { d = d1; for(x = 0; x < s->width; x++) { 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; + } + d++; } d1 += MAXX; } + +out: fclose(f); - return; + if (error_is_set(errp)) { + unlink(filename); + } } static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch,