From patchwork Wed Mar 14 22:55:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 146757 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 1004DB6EEE for ; Thu, 15 Mar 2012 09:55:58 +1100 (EST) Received: from localhost ([::1]:60558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7x6p-0007h8-Um for incoming@patchwork.ozlabs.org; Wed, 14 Mar 2012 18:55:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7x6Z-0007WC-2q for qemu-devel@nongnu.org; Wed, 14 Mar 2012 18:55:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7x6W-0005s0-Pc for qemu-devel@nongnu.org; Wed, 14 Mar 2012 18:55:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7x6W-0005ro-IG for qemu-devel@nongnu.org; Wed, 14 Mar 2012 18:55:36 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2EMtY3r024849 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Mar 2012 18:55:35 -0400 Received: from garlic.redhat.com (vpn-200-211.tlv.redhat.com [10.35.200.211]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2EMtFUK006339; Wed, 14 Mar 2012 18:55:32 -0400 From: Alon Levy To: qemu-devel@nongnu.org, lcapitulino@redhat.com Date: Thu, 15 Mar 2012 00:55:13 +0200 Message-Id: <1331765714-26209-5-git-send-email-alevy@redhat.com> In-Reply-To: <1331765714-26209-1-git-send-email-alevy@redhat.com> References: <1331765714-26209-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: mlureau@redhat.com Subject: [Qemu-devel] [PATCH v2 4/5] vga: ppm_save(): Return error on failure 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 From: Luiz Capitulino This makes all devices using ppm_save() return an error appropriately when the screendump command fails. Based on a code by Anthony Liguori. Signed-off-by: Luiz Capitulino Signed-off-by: Alon Levy --- hw/blizzard.c | 2 +- hw/qxl.c | 2 +- hw/vga.c | 8 +++++--- hw/vga_int.h | 3 ++- hw/vmware_vga.c | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/blizzard.c b/hw/blizzard.c index 76df78c..29e5ae6 100644 --- a/hw/blizzard.c +++ b/hw/blizzard.c @@ -942,7 +942,7 @@ static void blizzard_screen_dump(void *opaque, const char *filename, blizzard_update_display(opaque); } if (s && ds_get_data(s->state)) - ppm_save(filename, s->state->surface); + ppm_save(filename, s->state->surface, errp); } #define DEPTH 8 diff --git a/hw/qxl.c b/hw/qxl.c index 27f27f5..aa68612 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1503,7 +1503,7 @@ static void qxl_hw_screen_dump(void *opaque, const char *filename, bool cswitch, case QXL_MODE_COMPAT: case QXL_MODE_NATIVE: qxl_render_update(qxl); - ppm_save(filename, qxl->ssd.ds->surface); + ppm_save(filename, qxl->ssd.ds->surface, errp); break; case QXL_MODE_VGA: vga->screen_dump(vga, filename, cswitch, errp); diff --git a/hw/vga.c b/hw/vga.c index 79c5c38..80e6dca 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2365,7 +2365,7 @@ void vga_init_vbe(VGACommonState *s, MemoryRegion *system_memory) /********************************************************/ /* vga screen dump */ -int ppm_save(const char *filename, struct DisplaySurface *ds) +int ppm_save(const char *filename, struct DisplaySurface *ds, Error **errp) { FILE *f; uint8_t *d, *d1; @@ -2377,8 +2377,10 @@ int ppm_save(const char *filename, struct DisplaySurface *ds) trace_ppm_save(filename, ds); f = fopen(filename, "wb"); - if (!f) + if (!f) { + error_set_file_open_failed(errp, filename, errno); return -1; + } fprintf(f, "P6\n%d %d\n%d\n", ds->width, ds->height, 255); linebuf = g_malloc(ds->width * 3); @@ -2420,5 +2422,5 @@ static void vga_screen_dump(void *opaque, const char *filename, bool cswitch, vga_invalidate_display(s); vga_hw_update(); } - ppm_save(filename, s->ds->surface); + ppm_save(filename, s->ds->surface, errp); } diff --git a/hw/vga_int.h b/hw/vga_int.h index 7685b2b..63078ba 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -24,6 +24,7 @@ #include #include "memory.h" +#include "error.h" #define ST01_V_RETRACE 0x08 #define ST01_DISP_ENABLE 0x01 @@ -200,7 +201,7 @@ void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val); uint32_t vga_mem_readb(VGACommonState *s, target_phys_addr_t addr); void vga_mem_writeb(VGACommonState *s, target_phys_addr_t addr, uint32_t val); void vga_invalidate_scanlines(VGACommonState *s, int y1, int y2); -int ppm_save(const char *filename, struct DisplaySurface *ds); +int ppm_save(const char *filename, struct DisplaySurface *ds, Error **errp); int vga_ioport_invalid(VGACommonState *s, uint32_t addr); void vga_init_vbe(VGACommonState *s, MemoryRegion *address_space); diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 6868778..0769652 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1016,7 +1016,7 @@ static void vmsvga_screen_dump(void *opaque, const char *filename, bool cswitch, if (s->depth == 32) { DisplaySurface *ds = qemu_create_displaysurface_from(s->width, s->height, 32, ds_get_linesize(s->vga.ds), s->vga.vram_ptr); - ppm_save(filename, ds); + ppm_save(filename, ds, errp); g_free(ds); } }