diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-03-12 13:44:38 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-04-16 09:03:48 +0200 |
| commit | 1dbfa005032d4fa5d7a5242da856d3487c907431 (patch) | |
| tree | 511de9d82785cdd3bfa5528911dd9ff62073bac3 /hw/display | |
| parent | 64840c66b702cc4c809c72d8ad5d26861dd7fd8d (diff) | |
| download | qemu-1dbfa005032d4fa5d7a5242da856d3487c907431.zip qemu-1dbfa005032d4fa5d7a5242da856d3487c907431.tar.gz qemu-1dbfa005032d4fa5d7a5242da856d3487c907431.tar.bz2 | |
console: rename vga_hw_*, add QemuConsole param
Add QemuConsole parameter to vga_hw_*, so the interface allows to update
non-active consoles (the actual code can't handle this yet, see next
patch). Passing NULL is allowed and updates the active console, like
the functions do today.
While touching all vga_hw_* calls anyway rename that to the functions to
hardware-neutral graphics_hw_*
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/cirrus_vga.c | 2 | ||||
| -rw-r--r-- | hw/display/qxl.c | 2 | ||||
| -rw-r--r-- | hw/display/vga.c | 2 | ||||
| -rw-r--r-- | hw/display/vga_int.h | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index bf2181a..514bc33 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -720,7 +720,7 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) /* we have to flush all pending changes so that the copy is generated at the appropriate moment in time */ if (notify) - vga_hw_update(); + graphic_hw_update(s->vga.con); (*s->cirrus_rop) (s, s->vga.vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask), diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 930b7cf..247209d 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1074,7 +1074,7 @@ static void qxl_enter_vga_mode(PCIQXLDevice *d) qemu_spice_create_host_primary(&d->ssd); d->mode = QXL_MODE_VGA; vga_dirty_log_start(&d->vga); - vga_hw_update(); + graphic_hw_update(d->vga.con); } static void qxl_exit_vga_mode(PCIQXLDevice *d) diff --git a/hw/display/vga.c b/hw/display/vga.c index c1b67bb..e37e898 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2452,6 +2452,6 @@ static void vga_screen_dump(void *opaque, const char *filename, bool cswitch, if (cswitch) { vga_invalidate_display(s); } - vga_hw_update(); + graphic_hw_update(s->con); ppm_save(filename, surface, errp); } diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 260f7d6..1b8f670 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -152,10 +152,10 @@ typedef struct VGACommonState { uint32_t cursor_offset; unsigned int (*rgb_to_pixel)(unsigned int r, unsigned int g, unsigned b); - vga_hw_update_ptr update; - vga_hw_invalidate_ptr invalidate; - vga_hw_screen_dump_ptr screen_dump; - vga_hw_text_update_ptr text_update; + graphic_hw_update_ptr update; + graphic_hw_invalidate_ptr invalidate; + graphic_hw_screen_dump_ptr screen_dump; + graphic_hw_text_update_ptr text_update; bool full_update_text; bool full_update_gfx; /* hardware mouse cursor support */ |