From patchwork Fri May 25 19:41:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161421 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 CD34EB6EEC for ; Sat, 26 May 2012 06:33:20 +1000 (EST) Received: from localhost ([::1]:41813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY1CI-00063g-Lb for incoming@patchwork.ozlabs.org; Fri, 25 May 2012 16:33:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OV-0006vz-0O for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY0OT-0004cO-2A for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OS-0004bY-PS for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:48 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJflxH014208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 May 2012 15:41:47 -0400 Received: from localhost (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4PJfjA6010362; Fri, 25 May 2012 15:41:46 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 16:41:16 -0300 Message-Id: <1337974879-3656-12-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.67 on 10.5.11.11 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 11/14] g364fb: g364fb_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/g364fb.c | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/hw/g364fb.c b/hw/g364fb.c index 498154b..a18a414 100644 --- a/hw/g364fb.c +++ b/hw/g364fb.c @@ -301,35 +301,59 @@ static void g364fb_screen_dump(void *opaque, const char *filename, bool cswitch, qemu_flush_coalesced_mmio_buffer(); if (s->depth != 8) { - error_report("g364: unknown guest depth %d", s->depth); + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "depth", "8"); return; } - f = fopen(filename, "wb"); - if (!f) + f = qemu_fopen_err(filename, "wb", errp); + if (error_is_set(errp)) { return; + } if (s->ctla & CTLA_FORCE_BLANK) { /* blank screen */ - fprintf(f, "P4\n%d %d\n", - s->width, s->height); + qemu_fprintf_err(errp, f, "P4\n%d %d\n", s->width, s->height); + if (error_is_set(errp)) { + goto out; + } for (y = 0; y < s->height; y++) - for (x = 0; x < s->width; x++) - fputc(0, f); + for (x = 0; x < s->width; x++) { + qemu_fputc_err(0, f, errp); + if (error_is_set(errp)) { + goto out; + } + } } else { data_buffer = s->vram + s->top_of_screen; - 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; + } for (y = 0; y < s->height; y++) for (x = 0; x < s->width; x++, data_buffer++) { index = *data_buffer; - fputc(s->color_palette[index][0], f); - fputc(s->color_palette[index][1], f); - fputc(s->color_palette[index][2], f); + qemu_fputc_err(s->color_palette[index][0], f, errp); + if (error_is_set(errp)) { + goto out; + } + + qemu_fputc_err(s->color_palette[index][1], f, errp); + if (error_is_set(errp)) { + goto out; + } + + qemu_fputc_err(s->color_palette[index][2], f, errp); + if (error_is_set(errp)) { + goto out; + } } } +out: fclose(f); + if (error_is_set(errp)) { + unlink(filename); + } } /* called for accesses to io ports */