ACK
On Thu, Oct 17, 2013 at 02:09:50PM -0500, Jeremy White wrote:
> Signed-off-by: Jeremy White <jwhite@xxxxxxxxxxxxxxx>
> ---
> src/qxl_driver.c | 4 ++--
> src/spiceqxl_display.c | 2 +-
> src/spiceqxl_io_port.c | 22 +++++++++++-----------
> 3 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/src/qxl_driver.c b/src/qxl_driver.c
> index f076f00..91ba6c2 100644
> --- a/src/qxl_driver.c
> +++ b/src/qxl_driver.c
> @@ -270,7 +270,7 @@ qxl_unmap_memory (qxl_screen_t *qxl)
> #ifdef XSPICE
> if (qxl->worker)
> {
> - qxl->worker->stop (qxl->worker);
> + spice_server_vm_stop(qxl->spice_server);
> qxl->worker_running = FALSE;
> }
> #endif
> @@ -662,7 +662,7 @@ spiceqxl_screen_init (ScrnInfoPtr pScrn, qxl_screen_t *qxl)
> if (! qxl->worker_running)
> {
> xspice_register_handlers();
> - qxl->worker->start (qxl->worker);
> + spice_server_vm_start(qxl->spice_server);
> qxl->worker_running = TRUE;
> }
> }
> diff --git a/src/spiceqxl_display.c b/src/spiceqxl_display.c
> index 3acbb1c..a3a8978 100644
> --- a/src/spiceqxl_display.c
> +++ b/src/spiceqxl_display.c
> @@ -95,7 +95,7 @@ static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)
> return;
> }
> dprint(qxl, 1, "%s:\n", __FUNCTION__);
> - qxl_worker->add_memslot(qxl_worker, &slot);
> + spice_qxl_add_memslot(sin, &slot);
> qxl->worker = qxl_worker;
> }
>
> diff --git a/src/spiceqxl_io_port.c b/src/spiceqxl_io_port.c
> index f570041..165b8a9 100644
> --- a/src/spiceqxl_io_port.c
> +++ b/src/spiceqxl_io_port.c
> @@ -123,7 +123,7 @@ static void qxl_soft_reset(qxl_screen_t *qxl)
> static void qxl_reset_surfaces(qxl_screen_t *qxl)
> {
> dprint(1, "%s:\n", __FUNCTION__);
> - qxl->worker->destroy_surfaces(qxl->worker);
> + spice_qxl_destroy_surfaces(&qxl->display_sin);
> // TODO - do we have guest_surfaces?
> //memset(&d->guest_surfaces.cmds, 0, sizeof(d->guest_surfaces.cmds));
> }
> @@ -132,8 +132,8 @@ static void qxl_hard_reset(qxl_screen_t *qxl)
> {
> dprint(1, "%s: start\n", __FUNCTION__);
>
> - qxl->worker->reset_cursor(qxl->worker);
> - qxl->worker->reset_image_cache(qxl->worker);
> + spice_qxl_reset_cursor(&qxl->display_sin);
> + spice_qxl_reset_image_cache(&qxl->display_sin);
> qxl_reset_surfaces(qxl);
>
> qxl_reset_state(qxl);
> @@ -161,14 +161,14 @@ static void qxl_create_guest_primary(qxl_screen_t *qxl)
> surface.mouse_mode = TRUE;
> surface.group_id = 0;
> qxl->cmdflags = 0;
> - qxl->worker->create_primary_surface(qxl->worker, 0, &surface);
> + spice_qxl_create_primary_surface(&qxl->display_sin, 0, &surface);
> }
>
> static void qxl_destroy_primary(qxl_screen_t *qxl)
> {
> dprint(1, "%s\n", __FUNCTION__);
>
> - qxl->worker->destroy_primary_surface(qxl->worker, 0);
> + spice_qxl_destroy_primary_surface(&qxl->display_sin, 0);
> }
>
>
> @@ -216,15 +216,15 @@ void ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val)
> case QXL_IO_UPDATE_AREA:
> {
> QXLRect update = *(QXLRect*)&header->update_area;
> - qxl->worker->update_area(qxl->worker, header->update_surface,
> + spice_qxl_update_area(&qxl->display_sin, header->update_surface,
> &update, NULL, 0, 0);
> break;
> }
> case QXL_IO_NOTIFY_CMD:
> - qxl->worker->wakeup(qxl->worker);
> + spice_qxl_wakeup(&qxl->display_sin);
> break;
> case QXL_IO_NOTIFY_CURSOR:
> - qxl->worker->wakeup(qxl->worker);
> + spice_qxl_wakeup(&qxl->display_sin);
> break;
> case QXL_IO_UPDATE_IRQ:
> /* qxl_set_irq(d); */
> @@ -238,7 +238,7 @@ void ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val)
> if (!SPICE_RING_IS_EMPTY(&header->release_ring)) {
> break;
> }
> - qxl->worker->oom(qxl->worker);
> + spice_qxl_oom(&qxl->display_sin);
> break;
> case QXL_IO_SET_MODE:
> dprint(1, "QXL_SET_MODE %d\n", val);
> @@ -270,10 +270,10 @@ void ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val)
> qxl_destroy_primary(qxl);
> break;
> case QXL_IO_DESTROY_SURFACE_WAIT:
> - qxl->worker->destroy_surface_wait(qxl->worker, val);
> + spice_qxl_destroy_surface_wait(&qxl->display_sin, val);
> break;
> case QXL_IO_DESTROY_ALL_SURFACES:
> - qxl->worker->destroy_surfaces(qxl->worker);
> + spice_qxl_destroy_surfaces(&qxl->display_sin);
> break;
> case QXL_IO_FLUSH_SURFACES_ASYNC:
> fprintf(stderr, "ERROR: async callback Unimplemented\n");
> --
> 1.7.10.4
>
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
pgpOYuscpnen9.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel