diff options
| author | Alon Levy <alevy@redhat.com> | 2013-08-12 19:48:24 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2013-08-14 12:08:04 +0300 |
| commit | 9b8ff0428468b7f081fe6f2b27774af2d0b4dadf (patch) | |
| tree | 6d88a866cc1455d3c73ce3925de4f55c63891e0d | |
| parent | bc50ff07676fa0b15df3aa2ae7e54936a8f81f95 (diff) | |
| download | spice-9b8ff0428468b7f081fe6f2b27774af2d0b4dadf.tar.gz spice-9b8ff0428468b7f081fe6f2b27774af2d0b4dadf.tar.xz spice-9b8ff0428468b7f081fe6f2b27774af2d0b4dadf.zip | |
server: s/red_wait_all_sent/red_channel_wait_all_sent/
| -rw-r--r-- | server/red_channel.c | 2 | ||||
| -rw-r--r-- | server/red_channel.h | 2 | ||||
| -rw-r--r-- | server/red_worker.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/server/red_channel.c b/server/red_channel.c index d0b979e7..37b0c1c6 100644 --- a/server/red_channel.c +++ b/server/red_channel.c @@ -2274,7 +2274,7 @@ static void rcc_shutdown_if_pending_send(RedChannelClient *rcc) } } -void red_wait_all_sent(RedChannel *channel) +void red_channel_wait_all_sent(RedChannel *channel) { uint64_t end_time; uint32_t max_pipe_size; diff --git a/server/red_channel.h b/server/red_channel.h index b2a3a6ad..9021b3f0 100644 --- a/server/red_channel.h +++ b/server/red_channel.h @@ -604,6 +604,6 @@ void red_channel_client_wait_pipe_item_sent(RedChannelClient *rcc, void red_wait_outgoing_item(RedChannelClient *rcc); /* blocking function */ -void red_wait_all_sent(RedChannel *channel); +void red_channel_wait_all_sent(RedChannel *channel); #endif diff --git a/server/red_worker.c b/server/red_worker.c index 0e86cff7..175cf92e 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -11136,7 +11136,7 @@ static inline void red_cursor_reset(RedWorker *worker) if (!worker->cursor_channel->common.during_target_migrate) { red_pipes_add_verb(&worker->cursor_channel->common.base, SPICE_MSG_CURSOR_RESET); } - red_wait_all_sent(&worker->cursor_channel->common.base); + red_channel_wait_all_sent(&worker->cursor_channel->common.base); } } @@ -11419,8 +11419,8 @@ void handle_dev_stop(void *opaque, void *payload) * purge the pipe, send destroy_all_surfaces * to the client (there is no such message right now), and start * from scratch on the destination side */ - red_wait_all_sent(&worker->display_channel->common.base); - red_wait_all_sent(&worker->cursor_channel->common.base); + red_channel_wait_all_sent(&worker->display_channel->common.base); + red_channel_wait_all_sent(&worker->cursor_channel->common.base); } static int display_channel_wait_for_migrate_data(DisplayChannel *display) |