summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-24 02:21:24 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-24 02:21:24 +0000
commit38334f76300260480e3bd3b77cb5b86fd3d66038 (patch)
tree26b7205a3350582c427e6534281c422dd9175cde /hw
parent818220f5e9ef39fc5025b9f2277fac483d99d330 (diff)
downloadqemu-38334f76300260480e3bd3b77cb5b86fd3d66038.zip
Don't use ds->dpy_copy directly from hw/ (Jan Niehusmann).
I left a TODO in the code because this still doesn't definitely fix all issues. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5308 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/cirrus_vga.c10
-rw-r--r--hw/vmware_vga.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 8e223e2662..53688a0eac 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -769,13 +769,13 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
s->cirrus_blt_width, s->cirrus_blt_height);
if (notify)
- s->ds->dpy_copy(s->ds,
- sx, sy, dx, dy,
- s->cirrus_blt_width / depth,
- s->cirrus_blt_height);
+ qemu_console_copy(s->console,
+ sx, sy, dx, dy,
+ s->cirrus_blt_width / depth,
+ s->cirrus_blt_height);
/* we don't have to notify the display that this portion has
- changed since dpy_copy implies this */
+ changed since qemu_console_copy implies this */
if (!notify)
cirrus_invalidate_region(s, s->cirrus_blt_dstaddr,
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index efbcd966a5..625cd83576 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -384,7 +384,7 @@ static inline void vmsvga_copy_rect(struct vmsvga_state_s *s,
# ifdef DIRECT_VRAM
if (s->ds->dpy_copy)
- s->ds->dpy_copy(s->ds, x0, y0, x1, y1, w, h);
+ qemu_console_copy(s->console, x0, y0, x1, y1, w, h);
else
# endif
{