diff options
| -rw-r--r-- | console.c | 10 | ||||
| -rw-r--r-- | console.h | 2 | ||||
| -rw-r--r-- | hw/blizzard.c | 8 | ||||
| -rw-r--r-- | hw/g364fb.c | 2 | ||||
| -rw-r--r-- | hw/omap_lcdc.c | 7 | ||||
| -rw-r--r-- | hw/qxl.c | 4 | ||||
| -rw-r--r-- | hw/tcx.c | 8 | ||||
| -rw-r--r-- | hw/vga.c | 10 | ||||
| -rw-r--r-- | hw/vmware_vga.c | 4 |
9 files changed, 34 insertions, 21 deletions
@@ -176,19 +176,23 @@ void vga_hw_invalidate(void) void vga_hw_screen_dump(const char *filename) { TextConsole *previous_active_console; + bool cswitch; previous_active_console = active_console; + cswitch = previous_active_console && previous_active_console->index != 0; /* There is currently no way of specifying which screen we want to dump, so always dump the first one. */ - console_select(0); + if (cswitch) { + console_select(0); + } if (consoles[0] && consoles[0]->hw_screen_dump) { - consoles[0]->hw_screen_dump(consoles[0]->hw, filename); + consoles[0]->hw_screen_dump(consoles[0]->hw, filename, cswitch); } else { error_report("screen dump not implemented"); } - if (previous_active_console) { + if (cswitch) { console_select(previous_active_console->index); } } @@ -340,7 +340,7 @@ static inline void console_write_ch(console_ch_t *dest, uint32_t ch) typedef void (*vga_hw_update_ptr)(void *); typedef void (*vga_hw_invalidate_ptr)(void *); -typedef void (*vga_hw_screen_dump_ptr)(void *, const char *); +typedef void (*vga_hw_screen_dump_ptr)(void *, const char *, bool cswitch); typedef void (*vga_hw_text_update_ptr)(void *, console_ch_t *); DisplayState *graphic_console_init(vga_hw_update_ptr update, diff --git a/hw/blizzard.c b/hw/blizzard.c index b2c1b2284..c7d844d10 100644 --- a/hw/blizzard.c +++ b/hw/blizzard.c @@ -932,10 +932,14 @@ static void blizzard_update_display(void *opaque) s->my[1] = 0; } -static void blizzard_screen_dump(void *opaque, const char *filename) { +static void blizzard_screen_dump(void *opaque, const char *filename, + bool cswitch) +{ BlizzardState *s = (BlizzardState *) opaque; - blizzard_update_display(opaque); + if (cswitch) { + blizzard_update_display(opaque); + } if (s && ds_get_data(s->state)) ppm_save(filename, s->state->surface); } diff --git a/hw/g364fb.c b/hw/g364fb.c index 9c63bddc5..3a0b68fba 100644 --- a/hw/g364fb.c +++ b/hw/g364fb.c @@ -289,7 +289,7 @@ static void g364fb_reset(G364State *s) g364fb_invalidate_display(s); } -static void g364fb_screen_dump(void *opaque, const char *filename) +static void g364fb_screen_dump(void *opaque, const char *filename, bool cswitch) { G364State *s = opaque; int y, x; diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index f26530655..f17209387 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -264,9 +264,12 @@ static int ppm_save(const char *filename, uint8_t *data, return 0; } -static void omap_screen_dump(void *opaque, const char *filename) { +static void omap_screen_dump(void *opaque, const char *filename, bool cswitch) +{ struct omap_lcd_panel_s *omap_lcd = opaque; - omap_update_display(opaque); + if (cswitch) { + omap_update_display(opaque); + } if (omap_lcd && ds_get_data(omap_lcd->state)) ppm_save(filename, ds_get_data(omap_lcd->state), omap_lcd->width, omap_lcd->height, @@ -1436,7 +1436,7 @@ static void qxl_hw_invalidate(void *opaque) vga->invalidate(vga); } -static void qxl_hw_screen_dump(void *opaque, const char *filename) +static void qxl_hw_screen_dump(void *opaque, const char *filename, bool cswitch) { PCIQXLDevice *qxl = opaque; VGACommonState *vga = &qxl->vga; @@ -1448,7 +1448,7 @@ static void qxl_hw_screen_dump(void *opaque, const char *filename) ppm_save(filename, qxl->ssd.ds->surface); break; case QXL_MODE_VGA: - vga->screen_dump(vga, filename); + vga->screen_dump(vga, filename, cswitch); break; default: break; @@ -56,8 +56,8 @@ typedef struct TCXState { uint8_t dac_index, dac_state; } TCXState; -static void tcx_screen_dump(void *opaque, const char *filename); -static void tcx24_screen_dump(void *opaque, const char *filename); +static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch); +static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch); static void tcx_set_dirty(TCXState *s) { @@ -574,7 +574,7 @@ static int tcx_init1(SysBusDevice *dev) return 0; } -static void tcx_screen_dump(void *opaque, const char *filename) +static void tcx_screen_dump(void *opaque, const char *filename, bool cswitch) { TCXState *s = opaque; FILE *f; @@ -601,7 +601,7 @@ static void tcx_screen_dump(void *opaque, const char *filename) return; } -static void tcx24_screen_dump(void *opaque, const char *filename) +static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch) { TCXState *s = opaque; FILE *f; @@ -162,7 +162,7 @@ static uint32_t expand4[256]; static uint16_t expand2[256]; static uint8_t expand4to8[16]; -static void vga_screen_dump(void *opaque, const char *filename); +static void vga_screen_dump(void *opaque, const char *filename, bool cswitch); static void vga_update_memory_access(VGACommonState *s) { @@ -2407,11 +2407,13 @@ int ppm_save(const char *filename, struct DisplaySurface *ds) /* save the vga display in a PPM image even if no display is available */ -static void vga_screen_dump(void *opaque, const char *filename) +static void vga_screen_dump(void *opaque, const char *filename, bool cswitch) { VGACommonState *s = opaque; - vga_invalidate_display(s); - vga_hw_update(); + if (cswitch) { + vga_invalidate_display(s); + vga_hw_update(); + } ppm_save(filename, s->ds->surface); } diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index f8afa3c36..142d9f4ea 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1003,11 +1003,11 @@ static void vmsvga_invalidate_display(void *opaque) /* save the vga display in a PPM image even if no display is available */ -static void vmsvga_screen_dump(void *opaque, const char *filename) +static void vmsvga_screen_dump(void *opaque, const char *filename, bool cswitch) { struct vmsvga_state_s *s = opaque; if (!s->enable) { - s->vga.screen_dump(&s->vga, filename); + s->vga.screen_dump(&s->vga, filename, cswitch); return; } |