Acked-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
On Fri, 2016-01-29 at 13:28 +0000, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
> ---
> server/red-record-qxl.c | 14 +++++++-------
> server/red-record-qxl.h | 12 ++++++------
> server/red-worker.c | 12 ++++++------
> 3 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/server/red-record-qxl.c b/server/red-record-qxl.c
> index 9add176..542f357 100644
> --- a/server/red-record-qxl.c
> +++ b/server/red-record-qxl.c
> @@ -788,7 +788,7 @@ void red_record_cursor_cmd(FILE *fd, RedMemSlotInfo
> *slots, int group_id,
> }
> }
>
> -void red_record_dev_input_primary_surface_create(SpiceRecord *record,
> +void spice_record_dev_input_primary_surface_create(SpiceRecord *record,
> QXLDevSurfaceCreate* surface, uint8_t *line_0)
> {
> FILE *fd = record->fd;
> @@ -801,7 +801,7 @@ void
> red_record_dev_input_primary_surface_create(SpiceRecord *record,
> line_0);
> }
>
> -void red_record_event(SpiceRecord *record, int what, uint32_t type, unsigned
> long ts)
> +void spice_record_event(SpiceRecord *record, int what, uint32_t type,
> unsigned long ts)
> {
> // TODO: record the size of the packet in the header. This would make
> // navigating it much faster (well, I can add an index while I'm at it..)
> @@ -811,12 +811,12 @@ void red_record_event(SpiceRecord *record, int what,
> uint32_t type, unsigned lon
> fprintf(record->fd, "event %u %d %u %lu\n", record->counter++, what,
> type, ts);
> }
>
> -void red_record_qxl_command(SpiceRecord *record, RedMemSlotInfo *slots,
> - QXLCommandExt ext_cmd, unsigned long ts)
> +void spice_record_qxl_command(SpiceRecord *record, RedMemSlotInfo *slots,
> + QXLCommandExt ext_cmd, unsigned long ts)
> {
> FILE *fd = record->fd;
>
> - red_record_event(record, 0, ext_cmd.cmd.type, ts);
> + spice_record_event(record, 0, ext_cmd.cmd.type, ts);
>
> switch (ext_cmd.cmd.type) {
> case QXL_CMD_DRAW:
> @@ -834,7 +834,7 @@ void red_record_qxl_command(SpiceRecord *record,
> RedMemSlotInfo *slots,
> }
> }
>
> -SpiceRecord *red_record_new(void)
> +SpiceRecord *spice_record_new(void)
> {
> static const char header[] = "SPICE_REPLAY 1\n";
>
> @@ -862,7 +862,7 @@ SpiceRecord *red_record_new(void)
> return record;
> }
>
> -void red_record_free(SpiceRecord *record)
> +void spice_record_free(SpiceRecord *record)
> {
> if (record) {
> fclose(record->fd);
> diff --git a/server/red-record-qxl.h b/server/red-record-qxl.h
> index ad77962..403932a 100644
> --- a/server/red-record-qxl.h
> +++ b/server/red-record-qxl.h
> @@ -25,16 +25,16 @@
>
> typedef struct SpiceRecord SpiceRecord;
>
> -SpiceRecord* red_record_new(void);
> +SpiceRecord* spice_record_new(void);
>
> -void red_record_free(SpiceRecord *record);
> +void spice_record_free(SpiceRecord *record);
>
> -void red_record_dev_input_primary_surface_create(
> +void spice_record_dev_input_primary_surface_create(
> SpiceRecord *record, QXLDevSurfaceCreate *surface, uint8_t
> *line_0);
>
> -void red_record_event(SpiceRecord *record, int what, uint32_t type, unsigned
> long ts);
> +void spice_record_event(SpiceRecord *record, int what, uint32_t type,
> unsigned long ts);
>
> -void red_record_qxl_command(SpiceRecord *record, RedMemSlotInfo *slots,
> - QXLCommandExt ext_cmd, unsigned long ts);
> +void spice_record_qxl_command(SpiceRecord *record, RedMemSlotInfo *slots,
> + QXLCommandExt ext_cmd, unsigned long ts);
>
> #endif
> diff --git a/server/red-worker.c b/server/red-worker.c
> index c2e1a19..73352ea 100644
> --- a/server/red-worker.c
> +++ b/server/red-worker.c
> @@ -239,8 +239,8 @@ static int red_process_display(RedWorker *worker, int
> *ring_is_empty)
> }
>
> if (worker->record)
> - red_record_qxl_command(worker->record, &worker->mem_slots,
> ext_cmd,
> - stat_now(CLOCK_THREAD_CPUTIME_ID));
> + spice_record_qxl_command(worker->record, &worker->mem_slots,
> ext_cmd,
> + stat_now(CLOCK_THREAD_CPUTIME_ID));
>
> stat_inc_counter(worker->command_counter, 1);
> worker->display_poll_tries = 0;
> @@ -724,8 +724,8 @@ static void dev_create_primary_surface(RedWorker *worker,
> uint32_t surface_id,
> return;
> }
> if (worker->record) {
> - red_record_dev_input_primary_surface_create(worker->record,
> - &surface, line_0);
> + spice_record_dev_input_primary_surface_create(worker->record,
> + &surface, line_0);
> }
>
> if (surface.stride < 0) {
> @@ -1222,7 +1222,7 @@ static void worker_dispatcher_record(void *opaque,
> uint32_t message_type, void *
> {
> RedWorker *worker = opaque;
>
> - red_record_event(worker->record, 1, message_type,
> stat_now(CLOCK_THREAD_CPUTIME_ID));
> + spice_record_event(worker->record, 1, message_type,
> stat_now(CLOCK_THREAD_CPUTIME_ID));
> }
>
> static void register_callbacks(Dispatcher *dispatcher)
> @@ -1483,7 +1483,7 @@ RedWorker* red_worker_new(QXLInstance *qxl,
> RedDispatcher *red_dispatcher)
> worker->core = event_loop_core;
> worker->core.main_context = g_main_context_new();
>
> - worker->record = red_record_new();
> + worker->record = spice_record_new();
> dispatcher = red_dispatcher_get_dispatcher(red_dispatcher);
> dispatcher_set_opaque(dispatcher, worker);
>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel