From aee32bf333b13994d9eafb768129e4c2c8688887 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 20 Jul 2011 12:20:52 +0300 Subject: spice/qxl: move worker wrappers Move the wrapper functions which are used by qxl only to qxl.c. Rename them from qemu_spice_* to qxl_spice_*. Also pass in a qxl state pointer instead of a SimpleSpiceDisplay pointer. Signed-off-by: Gerd Hoffmann --- ui/spice-display.c | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) (limited to 'ui/spice-display.c') diff --git a/ui/spice-display.c b/ui/spice-display.c index 93e25bf1ef..af10ae8a6f 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -63,15 +63,6 @@ void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r) } -void qemu_spice_update_area(SimpleSpiceDisplay *ssd, uint32_t surface_id, - struct QXLRect *area, struct QXLRect *dirty_rects, - uint32_t num_dirty_rects, - uint32_t clear_dirty_region) -{ - ssd->worker->update_area(ssd->worker, surface_id, area, dirty_rects, - num_dirty_rects, clear_dirty_region); -} - void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot) { ssd->worker->add_memslot(ssd->worker, memslot); @@ -93,27 +84,11 @@ void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id) ssd->worker->destroy_primary_surface(ssd->worker, id); } -void qemu_spice_destroy_surface_wait(SimpleSpiceDisplay *ssd, uint32_t id) -{ - ssd->worker->destroy_surface_wait(ssd->worker, id); -} - -void qemu_spice_loadvm_commands(SimpleSpiceDisplay *ssd, - struct QXLCommandExt *ext, uint32_t count) -{ - ssd->worker->loadvm_commands(ssd->worker, ext, count); -} - void qemu_spice_wakeup(SimpleSpiceDisplay *ssd) { ssd->worker->wakeup(ssd->worker); } -void qemu_spice_oom(SimpleSpiceDisplay *ssd) -{ - ssd->worker->oom(ssd->worker); -} - void qemu_spice_start(SimpleSpiceDisplay *ssd) { ssd->worker->start(ssd->worker); @@ -124,27 +99,6 @@ void qemu_spice_stop(SimpleSpiceDisplay *ssd) ssd->worker->stop(ssd->worker); } -void qemu_spice_reset_memslots(SimpleSpiceDisplay *ssd) -{ - ssd->worker->reset_memslots(ssd->worker); -} - -void qemu_spice_destroy_surfaces(SimpleSpiceDisplay *ssd) -{ - ssd->worker->destroy_surfaces(ssd->worker); -} - -void qemu_spice_reset_image_cache(SimpleSpiceDisplay *ssd) -{ - ssd->worker->reset_image_cache(ssd->worker); -} - -void qemu_spice_reset_cursor(SimpleSpiceDisplay *ssd) -{ - ssd->worker->reset_cursor(ssd->worker); -} - - static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) { SimpleSpiceUpdate *update; -- cgit v1.2.1