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 <lcapitul...@redhat.com> --- hw/omap_lcdc.c | 53 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index 3d6328f..cf5a264 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -224,18 +224,22 @@ static void omap_update_display(void *opaque) omap_lcd->invalidate = 0; } -static int omap_ppm_save(const char *filename, uint8_t *data, - int w, int h, int linesize) +static void omap_ppm_save(const char *filename, uint8_t *data, + int w, int h, int linesize, Error **errp) { FILE *f; uint8_t *d, *d1; unsigned int v; int y, x, bpp; - f = fopen(filename, "wb"); - if (!f) - return -1; - fprintf(f, "P6\n%d %d\n%d\n", w, h, 255); + f = qemu_fopen_err(filename, "wb", errp); + if (error_is_set(errp)) { + return; + } + qemu_fprintf_err(errp, f, "P6\n%d %d\n%d\n", w, h, 255); + if (error_is_set(errp)) { + goto out; + } d1 = data; bpp = linesize / w; for (y = 0; y < h; y ++) { @@ -244,24 +248,45 @@ static int omap_ppm_save(const char *filename, uint8_t *data, v = *(uint32_t *) d; switch (bpp) { case 2: - fputc((v >> 8) & 0xf8, f); - fputc((v >> 3) & 0xfc, f); - fputc((v << 3) & 0xf8, f); + qemu_fputc_err((v >> 8) & 0xf8, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v >> 3) & 0xfc, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v << 3) & 0xf8, f, errp); + if (error_is_set(errp)) { + goto out; + } break; case 3: case 4: default: - fputc((v >> 16) & 0xff, f); - fputc((v >> 8) & 0xff, f); - fputc((v) & 0xff, f); + qemu_fputc_err((v >> 16) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v >> 8) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } + qemu_fputc_err((v) & 0xff, f, errp); + if (error_is_set(errp)) { + goto out; + } break; } d += bpp; } d1 += linesize; } +out: fclose(f); - return 0; + if (error_is_set(errp)) { + unlink(filename); + } } static void omap_screen_dump(void *opaque, const char *filename, bool cswitch, @@ -273,7 +298,7 @@ static void omap_screen_dump(void *opaque, const char *filename, bool cswitch, if (omap_lcd && ds_get_data(omap_lcd->state)) omap_ppm_save(filename, ds_get_data(omap_lcd->state), omap_lcd->width, omap_lcd->height, - ds_get_linesize(omap_lcd->state)); + ds_get_linesize(omap_lcd->state), errp); } static void omap_invalidate_display(void *opaque) { -- 1.7.10.2.565.gbd578b5