[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/19] g364fb: g364fb_screen_dump(): add error handl
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 17/19] g364fb: g364fb_screen_dump(): add error handling |
Date: |
Wed, 5 Sep 2012 15:58:44 -0300 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
hw/g364fb.c | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 40 insertions(+), 12 deletions(-)
diff --git a/hw/g364fb.c b/hw/g364fb.c
index 498154b..059e622 100644
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -293,7 +293,7 @@ static void g364fb_screen_dump(void *opaque, const char
*filename, bool cswitch,
Error **errp)
{
G364State *s = opaque;
- int y, x;
+ int ret, y, x;
uint8_t index;
uint8_t *data_buffer;
FILE *f;
@@ -301,35 +301,63 @@ 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_setg(errp, "g364: unknown guest depth %d", s->depth);
return;
}
f = fopen(filename, "wb");
- if (!f)
+ if (!f) {
+ error_setg(errp, "failed to open file '%s': %s", filename,
+ strerror(errno));
return;
+ }
if (s->ctla & CTLA_FORCE_BLANK) {
/* blank screen */
- fprintf(f, "P4\n%d %d\n",
- s->width, s->height);
+ ret = fprintf(f, "P4\n%d %d\n", s->width, s->height);
+ if (ret < 0) {
+ goto write_err;
+ }
for (y = 0; y < s->height; y++)
- for (x = 0; x < s->width; x++)
- fputc(0, f);
+ for (x = 0; x < s->width; x++) {
+ ret = fputc(0, f);
+ if (ret == EOF) {
+ goto write_err;
+ }
+ }
} else {
data_buffer = s->vram + s->top_of_screen;
- fprintf(f, "P6\n%d %d\n%d\n",
- s->width, s->height, 255);
+ ret = fprintf(f, "P6\n%d %d\n%d\n", s->width, s->height, 255);
+ if (ret < 0) {
+ goto write_err;
+ }
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);
+ ret = fputc(s->color_palette[index][0], f);
+ if (ret == EOF) {
+ goto write_err;
+ }
+ ret = fputc(s->color_palette[index][1], f);
+ if (ret == EOF) {
+ goto write_err;
+ }
+ ret = fputc(s->color_palette[index][2], f);
+ if (ret == EOF) {
+ goto write_err;
+ }
}
}
+out:
fclose(f);
+ return;
+
+write_err:
+ error_setg(errp, "failed to write to file '%s': %s", filename,
+ strerror(errno));
+ unlink(filename);
+ goto out;
}
/* called for accesses to io ports */
--
1.7.11.2.249.g31c7954.dirty
- [Qemu-devel] [PATCH 07/19] monitor: move key_defs[] table and introduce two help functions, (continued)
- [Qemu-devel] [PATCH 07/19] monitor: move key_defs[] table and introduce two help functions, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 10/19] json-parser: Fix potential NULL pointer segfault, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 08/19] qapi: convert sendkey, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 09/19] qapi: Fix potential NULL pointer segfault, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 11/19] error: add error_setg(), Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 14/19] vga: ppm_save(): add error handling, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 13/19] qapi: convert screendump, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 15/19] omap_lcdc: rename ppm_save() to omap_ppm_save(), Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 12/19] console: vga_hw_screen_dump_ptr: take Error argument, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 19/19] tcx: tcx_screen_dump(): add error handling, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 17/19] g364fb: g364fb_screen_dump(): add error handling,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 16/19] omap_lcdc: omap_ppm_save(): add error handling, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 18/19] tcx: tcx24_screen_dump(): add error handling, Luiz Capitulino, 2012/09/05
- Re: [Qemu-devel] [PULL 00/19]: QMP queue, Aurelien Jarno, 2012/09/10