[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] omap_lcdc: omap_ppm_save(): add error handlin
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 10/14] omap_lcdc: omap_ppm_save(): add error handling |
Date: |
Fri, 25 May 2012 16:41:15 -0300 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 02/14] qerror: add new errors, (continued)
- [Qemu-devel] [PATCH 02/14] qerror: add new errors, Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 03/14] cutils: introduce qemu_fopen_err(), Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 04/14] cutils: introduce qemu_fprintf_err(), Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 05/14] cutils: introduce qemu_fputc_err(), Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 06/14] cutils: introduce qemu_fwrite_err(), Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 07/14] omap_lcdc: rename ppm_save() to omap_ppm_save(), Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 08/14] console: vga_hw_screen_dump_ptr: take an Error argument, Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 09/14] vga: ppm_save(): add error handling, Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 12/14] tcx: tcx24_screen_dump(): add error handling, Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 13/14] tcx: tcx_screen_dump(): add error handling, Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 10/14] omap_lcdc: omap_ppm_save(): add error handling,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 14/14] qapi: convert screendump, Luiz Capitulino, 2012/05/25
- [Qemu-devel] [PATCH 11/14] g364fb: g364fb_screen_dump(): add error handling, Luiz Capitulino, 2012/05/25
- Re: [Qemu-devel] [PATCH qmp-next 00/14]: qapi: convert screendump, Alon Levy, 2012/05/28