diff options
| -rw-r--r-- | server/red_dispatcher.c | 223 | ||||
| -rw-r--r-- | server/spice-server.syms | 15 | ||||
| -rw-r--r-- | server/spice.h | 20 |
3 files changed, 226 insertions, 32 deletions
diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c index 56446abb..aa1990e0 100644 --- a/server/red_dispatcher.c +++ b/server/red_dispatcher.c @@ -209,11 +209,10 @@ static void update_client_mouse_allowed(void) } } -static void qxl_worker_update_area(QXLWorker *qxl_worker, uint32_t surface_id, +static void red_dispatcher_update_area(RedDispatcher *dispatcher, uint32_t surface_id, QXLRect *qxl_area, QXLRect *qxl_dirty_rects, uint32_t num_dirty_rects, uint32_t clear_dirty_region) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_UPDATE; SpiceRect *dirty_rects = spice_new0(SpiceRect, num_dirty_rects); SpiceRect *area = spice_new0(SpiceRect, 1); @@ -241,9 +240,16 @@ static void qxl_worker_update_area(QXLWorker *qxl_worker, uint32_t surface_id, free(area); } -static void qxl_worker_add_memslot(QXLWorker *qxl_worker, QXLDevMemSlot *mem_slot) +static void qxl_worker_update_area(QXLWorker *qxl_worker, uint32_t surface_id, + QXLRect *qxl_area, QXLRect *qxl_dirty_rects, + uint32_t num_dirty_rects, uint32_t clear_dirty_region) +{ + red_dispatcher_update_area((RedDispatcher*)qxl_worker, surface_id, qxl_area, + qxl_dirty_rects, num_dirty_rects, clear_dirty_region); +} + +static void red_dispatcher_add_memslot(RedDispatcher *dispatcher, QXLDevMemSlot *mem_slot) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_ADD_MEMSLOT; write_message(dispatcher->channel, &message); @@ -252,9 +258,13 @@ static void qxl_worker_add_memslot(QXLWorker *qxl_worker, QXLDevMemSlot *mem_slo ASSERT(message == RED_WORKER_MESSAGE_READY); } -static void qxl_worker_del_memslot(QXLWorker *qxl_worker, uint32_t slot_group_id, uint32_t slot_id) +static void qxl_worker_add_memslot(QXLWorker *qxl_worker, QXLDevMemSlot *mem_slot) +{ + red_dispatcher_add_memslot((RedDispatcher*)qxl_worker, mem_slot); +} + +static void red_dispatcher_del_memslot(RedDispatcher *dispatcher, uint32_t slot_group_id, uint32_t slot_id) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_DEL_MEMSLOT; write_message(dispatcher->channel, &message); @@ -262,9 +272,13 @@ static void qxl_worker_del_memslot(QXLWorker *qxl_worker, uint32_t slot_group_id send_data(dispatcher->channel, &slot_id, sizeof(uint32_t)); } -static void qxl_worker_destroy_surfaces(QXLWorker *qxl_worker) +static void qxl_worker_del_memslot(QXLWorker *qxl_worker, uint32_t slot_group_id, uint32_t slot_id) +{ + red_dispatcher_del_memslot((RedDispatcher*)qxl_worker, slot_group_id, slot_id); +} + +static void red_dispatcher_destroy_surfaces(RedDispatcher *dispatcher) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_DESTROY_SURFACES; write_message(dispatcher->channel, &message); @@ -272,9 +286,13 @@ static void qxl_worker_destroy_surfaces(QXLWorker *qxl_worker) ASSERT(message == RED_WORKER_MESSAGE_READY); } -static void qxl_worker_destroy_primary(QXLWorker *qxl_worker, uint32_t surface_id) +static void qxl_worker_destroy_surfaces(QXLWorker *qxl_worker) +{ + red_dispatcher_destroy_surfaces((RedDispatcher*)qxl_worker); +} + +static void red_dispatcher_destroy_primary(RedDispatcher *dispatcher, uint32_t surface_id) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_DESTROY_PRIMARY_SURFACE; write_message(dispatcher->channel, &message); @@ -290,10 +308,14 @@ static void qxl_worker_destroy_primary(QXLWorker *qxl_worker, uint32_t surface_i update_client_mouse_allowed(); } -static void qxl_worker_create_primary(QXLWorker *qxl_worker, uint32_t surface_id, +static void qxl_worker_destroy_primary(QXLWorker *qxl_worker, uint32_t surface_id) +{ + red_dispatcher_destroy_primary((RedDispatcher*)qxl_worker, surface_id); +} + +static void red_dispatcher_create_primary(RedDispatcher *dispatcher, uint32_t surface_id, QXLDevSurfaceCreate *surface) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_CREATE_PRIMARY_SURFACE; dispatcher->x_res = surface->width; @@ -310,9 +332,14 @@ static void qxl_worker_create_primary(QXLWorker *qxl_worker, uint32_t surface_id update_client_mouse_allowed(); } -static void qxl_worker_reset_image_cache(QXLWorker *qxl_worker) +static void qxl_worker_create_primary(QXLWorker *qxl_worker, uint32_t surface_id, + QXLDevSurfaceCreate *surface) +{ + red_dispatcher_create_primary((RedDispatcher*)qxl_worker, surface_id, surface); +} + +static void red_dispatcher_reset_image_cache(RedDispatcher *dispatcher) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_RESET_IMAGE_CACHE; write_message(dispatcher->channel, &message); @@ -320,9 +347,13 @@ static void qxl_worker_reset_image_cache(QXLWorker *qxl_worker) ASSERT(message == RED_WORKER_MESSAGE_READY); } -static void qxl_worker_reset_cursor(QXLWorker *qxl_worker) +static void qxl_worker_reset_image_cache(QXLWorker *qxl_worker) +{ + red_dispatcher_reset_image_cache((RedDispatcher*)qxl_worker); +} + +static void red_dispatcher_reset_cursor(RedDispatcher *dispatcher) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_RESET_CURSOR; write_message(dispatcher->channel, &message); @@ -330,9 +361,13 @@ static void qxl_worker_reset_cursor(QXLWorker *qxl_worker) ASSERT(message == RED_WORKER_MESSAGE_READY); } -static void qxl_worker_destroy_surface_wait(QXLWorker *qxl_worker, uint32_t surface_id) +static void qxl_worker_reset_cursor(QXLWorker *qxl_worker) +{ + red_dispatcher_reset_cursor((RedDispatcher*)qxl_worker); +} + +static void red_dispatcher_destroy_surface_wait(RedDispatcher *dispatcher, uint32_t surface_id) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_DESTROY_SURFACE_WAIT; write_message(dispatcher->channel, &message); @@ -341,18 +376,25 @@ static void qxl_worker_destroy_surface_wait(QXLWorker *qxl_worker, uint32_t surf ASSERT(message == RED_WORKER_MESSAGE_READY); } -static void qxl_worker_reset_memslots(QXLWorker *qxl_worker) +static void qxl_worker_destroy_surface_wait(QXLWorker *qxl_worker, uint32_t surface_id) +{ + red_dispatcher_destroy_surface_wait((RedDispatcher*)qxl_worker, surface_id); +} + +static void red_dispatcher_reset_memslots(RedDispatcher *dispatcher) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_RESET_MEMSLOTS; write_message(dispatcher->channel, &message); } -static void qxl_worker_wakeup(QXLWorker *qxl_worker) +static void qxl_worker_reset_memslots(QXLWorker *qxl_worker) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; + red_dispatcher_reset_memslots((RedDispatcher*)qxl_worker); +} +static void red_dispatcher_wakeup(RedDispatcher *dispatcher) +{ if (!test_bit(RED_WORKER_PENDING_WAKEUP, dispatcher->pending)) { RedWorkerMessage message = RED_WORKER_MESSAGE_WAKEUP; set_bit(RED_WORKER_PENDING_WAKEUP, &dispatcher->pending); @@ -360,9 +402,13 @@ static void qxl_worker_wakeup(QXLWorker *qxl_worker) } } -static void qxl_worker_oom(QXLWorker *qxl_worker) +static void qxl_worker_wakeup(QXLWorker *qxl_worker) +{ + red_dispatcher_wakeup((RedDispatcher*)qxl_worker); +} + +static void red_dispatcher_oom(RedDispatcher *dispatcher) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; if (!test_bit(RED_WORKER_PENDING_OOM, dispatcher->pending)) { RedWorkerMessage message = RED_WORKER_MESSAGE_OOM; set_bit(RED_WORKER_PENDING_OOM, &dispatcher->pending); @@ -370,17 +416,25 @@ static void qxl_worker_oom(QXLWorker *qxl_worker) } } -static void qxl_worker_start(QXLWorker *qxl_worker) +static void qxl_worker_oom(QXLWorker *qxl_worker) +{ + red_dispatcher_oom((RedDispatcher*)qxl_worker); +} + +static void red_dispatcher_start(RedDispatcher *dispatcher) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_START; write_message(dispatcher->channel, &message); } -static void qxl_worker_stop(QXLWorker *qxl_worker) +static void qxl_worker_start(QXLWorker *qxl_worker) +{ + red_dispatcher_start((RedDispatcher*)qxl_worker); +} + +static void red_dispatcher_stop(RedDispatcher *dispatcher) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_STOP; write_message(dispatcher->channel, &message); @@ -388,11 +442,15 @@ static void qxl_worker_stop(QXLWorker *qxl_worker) ASSERT(message == RED_WORKER_MESSAGE_READY); } -static void qxl_worker_loadvm_commands(QXLWorker *qxl_worker, - struct QXLCommandExt *ext, - uint32_t count) +static void qxl_worker_stop(QXLWorker *qxl_worker) +{ + red_dispatcher_stop((RedDispatcher*)qxl_worker); +} + +static void red_dispatcher_loadvm_commands(RedDispatcher *dispatcher, + struct QXLCommandExt *ext, + uint32_t count) { - RedDispatcher *dispatcher = (RedDispatcher *)qxl_worker; RedWorkerMessage message = RED_WORKER_MESSAGE_LOADVM_COMMANDS; red_printf(""); @@ -403,6 +461,13 @@ static void qxl_worker_loadvm_commands(QXLWorker *qxl_worker, ASSERT(message == RED_WORKER_MESSAGE_READY); } +static void qxl_worker_loadvm_commands(QXLWorker *qxl_worker, + struct QXLCommandExt *ext, + uint32_t count) +{ + red_dispatcher_loadvm_commands((RedDispatcher*)qxl_worker, ext, count); +} + void red_dispatcher_set_mm_time(uint32_t mm_time) { RedDispatcher *now = dispatchers; @@ -482,6 +547,100 @@ uint32_t red_dispatcher_qxl_ram_size(void) return qxl_info.qxl_ram_size; } +SPICE_GNUC_VISIBLE +void spice_qxl_wakeup(QXLInstance *instance) +{ + red_dispatcher_wakeup(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_oom(QXLInstance *instance) +{ + red_dispatcher_oom(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_start(QXLInstance *instance) +{ + red_dispatcher_start(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_stop(QXLInstance *instance) +{ + red_dispatcher_stop(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_update_area(QXLInstance *instance, uint32_t surface_id, + struct QXLRect *area, struct QXLRect *dirty_rects, + uint32_t num_dirty_rects, uint32_t clear_dirty_region) +{ + red_dispatcher_update_area(instance->st->dispatcher, surface_id, area, dirty_rects, + num_dirty_rects, clear_dirty_region); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_add_memslot(QXLInstance *instance, QXLDevMemSlot *slot) +{ + red_dispatcher_add_memslot(instance->st->dispatcher, slot); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_del_memslot(QXLInstance *instance, uint32_t slot_group_id, uint32_t slot_id) +{ + red_dispatcher_del_memslot(instance->st->dispatcher, slot_group_id, slot_id); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_reset_memslots(QXLInstance *instance) +{ + red_dispatcher_reset_memslots(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_destroy_surfaces(QXLInstance *instance) +{ + red_dispatcher_destroy_surfaces(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_destroy_primary_surface(QXLInstance *instance, uint32_t surface_id) +{ + red_dispatcher_destroy_primary(instance->st->dispatcher, surface_id); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_create_primary_surface(QXLInstance *instance, uint32_t surface_id, + QXLDevSurfaceCreate *surface) +{ + red_dispatcher_create_primary(instance->st->dispatcher, surface_id, surface); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_reset_image_cache(QXLInstance *instance) +{ + red_dispatcher_reset_image_cache(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_reset_cursor(QXLInstance *instance) +{ + red_dispatcher_reset_cursor(instance->st->dispatcher); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_destroy_surface_wait(QXLInstance *instance, uint32_t surface_id) +{ + red_dispatcher_destroy_surface_wait(instance->st->dispatcher, surface_id); +} + +SPICE_GNUC_VISIBLE +void spice_qxl_loadvm_commands(QXLInstance *instance, struct QXLCommandExt *ext, uint32_t count) +{ + red_dispatcher_loadvm_commands(instance->st->dispatcher, ext, count); +} + RedDispatcher *red_dispatcher_init(QXLInstance *qxl) { RedDispatcher *dispatcher; diff --git a/server/spice-server.syms b/server/spice-server.syms index da7a4835..4e120ee9 100644 --- a/server/spice-server.syms +++ b/server/spice-server.syms @@ -58,6 +58,21 @@ SPICE_SERVER_0.8.2 { global: spice_server_set_sasl; spice_server_set_sasl_appname; + spice_qxl_wakeup; + spice_qxl_oom; + spice_qxl_start; + spice_qxl_stop; + spice_qxl_update_area; + spice_qxl_add_memslot; + spice_qxl_del_memslot; + spice_qxl_reset_memslots; + spice_qxl_destroy_surfaces; + spice_qxl_destroy_primary_surface; + spice_qxl_create_primary_surface; + spice_qxl_reset_image_cache; + spice_qxl_reset_cursor; + spice_qxl_destroy_surface_wait; + spice_qxl_loadvm_commands; } SPICE_SERVER_0.8.1; SPICE_SERVER_0.10.0 { diff --git a/server/spice.h b/server/spice.h index f64ff414..0b82bb78 100644 --- a/server/spice.h +++ b/server/spice.h @@ -104,6 +104,7 @@ struct QXLRect; struct QXLWorker { uint32_t minor_version; uint32_t major_version; + /* These calls are deprecated. Pleaes use the spice_qxl_* calls instead */ void (*wakeup)(QXLWorker *worker); void (*oom)(QXLWorker *worker); void (*start)(QXLWorker *worker); @@ -124,6 +125,25 @@ struct QXLWorker { void (*loadvm_commands)(QXLWorker *worker, struct QXLCommandExt *ext, uint32_t count); }; +void spice_qxl_wakeup(QXLInstance *instance); +void spice_qxl_oom(QXLInstance *instance); +void spice_qxl_start(QXLInstance *instance); +void spice_qxl_stop(QXLInstance *instance); +void spice_qxl_update_area(QXLInstance *instance, uint32_t surface_id, + struct QXLRect *area, struct QXLRect *dirty_rects, + uint32_t num_dirty_rects, uint32_t clear_dirty_region); +void spice_qxl_add_memslot(QXLInstance *instance, QXLDevMemSlot *slot); +void spice_qxl_del_memslot(QXLInstance *instance, uint32_t slot_group_id, uint32_t slot_id); +void spice_qxl_reset_memslots(QXLInstance *instance); +void spice_qxl_destroy_surfaces(QXLInstance *instance); +void spice_qxl_destroy_primary_surface(QXLInstance *instance, uint32_t surface_id); +void spice_qxl_create_primary_surface(QXLInstance *instance, uint32_t surface_id, + QXLDevSurfaceCreate *surface); +void spice_qxl_reset_image_cache(QXLInstance *instance); +void spice_qxl_reset_cursor(QXLInstance *instance); +void spice_qxl_destroy_surface_wait(QXLInstance *instance, uint32_t surface_id); +void spice_qxl_loadvm_commands(QXLInstance *instance, struct QXLCommandExt *ext, uint32_t count); + typedef struct QXLDrawArea { uint8_t *buf; uint32_t size; |