From patchwork Wed May 30 14:14:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161987 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 37511B6FC5 for ; Thu, 31 May 2012 00:55:20 +1000 (EST) Received: from localhost ([::1]:53457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZjhO-00014h-9e for incoming@patchwork.ozlabs.org; Wed, 30 May 2012 10:16:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZjgb-0008Hd-Ug for qemu-devel@nongnu.org; Wed, 30 May 2012 10:15:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZjgW-0007ug-GH for qemu-devel@nongnu.org; Wed, 30 May 2012 10:15:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20112) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZjgV-0007tX-74 for qemu-devel@nongnu.org; Wed, 30 May 2012 10:15:36 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4UEFUU2004800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 May 2012 10:15:31 -0400 Received: from localhost (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4UEFSu1023560; Wed, 30 May 2012 10:15:30 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 30 May 2012 11:14:59 -0300 Message-Id: <1338387301-10074-13-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.67 on 10.5.11.12 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 12/14] tcx: tcx24_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 | 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[] = {