[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/14] g364fb: g364fb_screen_dump(): add error handl
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 11/14] g364fb: g364fb_screen_dump(): add error handling |
Date: |
Wed, 30 May 2012 11:14:58 -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/g364fb.c | 48 ++++++++++++++++++++++++++++++++++++------------
1 file changed, 36 insertions(+), 12 deletions(-)
diff --git a/hw/g364fb.c b/hw/g364fb.c
index 498154b..a18a414 100644
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -301,35 +301,59 @@ 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_set(errp, QERR_INVALID_PARAMETER_VALUE, "depth", "8");
return;
}
- f = fopen(filename, "wb");
- if (!f)
+ f = qemu_fopen_err(filename, "wb", errp);
+ if (error_is_set(errp)) {
return;
+ }
if (s->ctla & CTLA_FORCE_BLANK) {
/* blank screen */
- fprintf(f, "P4\n%d %d\n",
- s->width, s->height);
+ qemu_fprintf_err(errp, f, "P4\n%d %d\n", s->width, s->height);
+ if (error_is_set(errp)) {
+ goto out;
+ }
for (y = 0; y < s->height; y++)
- for (x = 0; x < s->width; x++)
- fputc(0, f);
+ for (x = 0; x < s->width; x++) {
+ qemu_fputc_err(0, f, errp);
+ if (error_is_set(errp)) {
+ goto out;
+ }
+ }
} else {
data_buffer = s->vram + s->top_of_screen;
- fprintf(f, "P6\n%d %d\n%d\n",
- s->width, s->height, 255);
+ qemu_fprintf_err(errp, f, "P6\n%d %d\n%d\n", s->width, s->height, 255);
+ if (error_is_set(errp)) {
+ goto out;
+ }
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);
+ qemu_fputc_err(s->color_palette[index][0], f, errp);
+ if (error_is_set(errp)) {
+ goto out;
+ }
+
+ qemu_fputc_err(s->color_palette[index][1], f, errp);
+ if (error_is_set(errp)) {
+ goto out;
+ }
+
+ qemu_fputc_err(s->color_palette[index][2], f, errp);
+ if (error_is_set(errp)) {
+ goto out;
+ }
}
}
+out:
fclose(f);
+ if (error_is_set(errp)) {
+ unlink(filename);
+ }
}
/* called for accesses to io ports */
--
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/30
- [Qemu-devel] [PATCH 07/14] omap_lcdc: rename ppm_save() to omap_ppm_save(), Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 10/14] omap_lcdc: omap_ppm_save(): add error handling, Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 12/14] tcx: tcx24_screen_dump(): add error handling, Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 13/14] tcx: tcx_screen_dump(): add error handling, Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 14/14] qapi: convert screendump, Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 01/14] qerror: extend QERR_TOO_MANY_FILES, Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 09/14] vga: ppm_save(): add error handling, Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 06/14] cutils: introduce qemu_fwrite_err(), Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 05/14] cutils: introduce qemu_fputc_err(), Luiz Capitulino, 2012/05/30
- [Qemu-devel] [PATCH 11/14] g364fb: g364fb_screen_dump(): add error handling,
Luiz Capitulino <=