From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBAZb-0003oR-Hh for qemu-devel@nongnu.org; Fri, 23 Mar 2012 15:54:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBAZZ-0005h5-AK for qemu-devel@nongnu.org; Fri, 23 Mar 2012 15:54:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBAZZ-0005h0-1u for qemu-devel@nongnu.org; Fri, 23 Mar 2012 15:54:53 -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 q2NJspWc009662 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 23 Mar 2012 15:54:51 -0400 Date: Fri, 23 Mar 2012 21:54:46 +0200 From: Alon Levy Message-ID: <20120323195446.GG23394@garlic> References: <1331765714-26209-1-git-send-email-alevy@redhat.com> <1332095353-19120-1-git-send-email-alevy@redhat.com> <1332095353-19120-6-git-send-email-alevy@redhat.com> <20120323112702.7550b87e@doriath.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120323112702.7550b87e@doriath.home> Subject: Re: [Qemu-devel] [PATCH v3 5/5] vga: ppm_save(): Return error on failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org On Fri, Mar 23, 2012 at 11:27:02AM -0300, Luiz Capitulino wrote: > On Sun, 18 Mar 2012 19:29:13 +0100 > Alon Levy wrote: > > > 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"); > > What I suggested to you was calling qemu_fopen_err() instead of fopen(). Oh, I didn't understand it that way. Makes more sense, will do. > > > - if (!f) > > + if (!f) { > > + error_set_file_open_failed(errp, filename, errno); > > Does this even compile? I don't recall. Moot now. > > Also note that there are device models that don't use ppm_save(), they have to > be converted too. > Will look at them. > > 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); > > } > > } > >