diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2013-03-12 14:48:31 +0100 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-04-16 09:03:48 +0200 |
commit | 2c62f08ddbf3fa80dc7202eb9a2ea60ae44e2cc5 (patch) | |
tree | 7be759b610535361478fae83071cb9389c0a1d6c /hw/display/vmware_vga.c | |
parent | 321f048d248472f1e90559976bb917d869981c68 (diff) |
console: simplify screendump
Screendumps are alot simpler as we can update non-active
QemuConsoles now. So we only need to update the QemuConsole
we want write out, then dump the DisplaySurface content into
a ppm file. Done.
No console switching needed. No special support code in the
gfx card emulation needed. Zap it all. Also move ppm_save
out of the vga code and next to the qmp_screendump function.
For now screen dumping is limited to console #0 (like it used
to be), even though it is dead simple to extend it to other
consoles. I wanna finish the console cleanup before setting
new qapi interfaces into stone.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Igor Mitsyanko <i.mitsyanko@gmail.com>
Diffstat (limited to 'hw/display/vmware_vga.c')
-rw-r--r-- | hw/display/vmware_vga.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 05befe44c7..61d8c15367 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1119,31 +1119,6 @@ static void vmsvga_invalidate_display(void *opaque) s->invalidated = 1; } -/* save the vga display in a PPM image even if no display is - available */ -static void vmsvga_screen_dump(void *opaque, const char *filename, bool cswitch, - Error **errp) -{ - struct vmsvga_state_s *s = opaque; - DisplaySurface *surface = qemu_console_surface(s->vga.con); - - if (!s->enable) { - s->vga.screen_dump(&s->vga, filename, cswitch, errp); - return; - } - - if (surface_bits_per_pixel(surface) == 32) { - DisplaySurface *ds = qemu_create_displaysurface_from( - surface_width(surface), - surface_height(surface), - 32, - surface_stride(surface), - s->vga.vram_ptr, false); - ppm_save(filename, ds, errp); - g_free(ds); - } -} - static void vmsvga_text_update(void *opaque, console_ch_t *chardata) { struct vmsvga_state_s *s = opaque; @@ -1212,7 +1187,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, s->vga.con = graphic_console_init(vmsvga_update_display, vmsvga_invalidate_display, - vmsvga_screen_dump, vmsvga_text_update, s); s->fifo_size = SVGA_FIFO_SIZE; |