|
|
e2c81d |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
20333d |
From: Alon Levy <alevy@redhat.com>
|
|
|
20333d |
Date: Mon, 12 Aug 2013 19:48:24 +0300
|
|
|
20333d |
Subject: [PATCH] server: s/red_wait_all_sent/red_channel_wait_all_sent/
|
|
|
20333d |
|
|
|
20333d |
https://bugzilla.redhat.com/show_bug.cgi?id=1016795
|
|
|
20333d |
(cherry picked from commit 9b8ff0428468b7f081fe6f2b27774af2d0b4dadf)
|
|
|
20333d |
---
|
|
|
20333d |
server/red_channel.c | 2 +-
|
|
|
20333d |
server/red_channel.h | 2 +-
|
|
|
20333d |
server/red_worker.c | 6 +++---
|
|
|
20333d |
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
20333d |
|
|
|
20333d |
diff --git a/server/red_channel.c b/server/red_channel.c
|
|
|
20333d |
index 555d376..6e43e0a 100644
|
|
|
20333d |
--- a/server/red_channel.c
|
|
|
20333d |
+++ b/server/red_channel.c
|
|
|
20333d |
@@ -2262,7 +2262,7 @@ static void rcc_shutdown_if_pending_send(RedChannelClient *rcc)
|
|
|
20333d |
}
|
|
|
20333d |
}
|
|
|
20333d |
|
|
|
20333d |
-void red_wait_all_sent(RedChannel *channel)
|
|
|
20333d |
+void red_channel_wait_all_sent(RedChannel *channel)
|
|
|
20333d |
{
|
|
|
20333d |
uint64_t end_time;
|
|
|
20333d |
uint32_t max_pipe_size;
|
|
|
20333d |
diff --git a/server/red_channel.h b/server/red_channel.h
|
|
|
20333d |
index b2a3a6a..9021b3f 100644
|
|
|
20333d |
--- a/server/red_channel.h
|
|
|
20333d |
+++ b/server/red_channel.h
|
|
|
20333d |
@@ -604,6 +604,6 @@ void red_channel_client_wait_pipe_item_sent(RedChannelClient *rcc,
|
|
|
20333d |
void red_wait_outgoing_item(RedChannelClient *rcc);
|
|
|
20333d |
|
|
|
20333d |
/* blocking function */
|
|
|
20333d |
-void red_wait_all_sent(RedChannel *channel);
|
|
|
20333d |
+void red_channel_wait_all_sent(RedChannel *channel);
|
|
|
20333d |
|
|
|
20333d |
#endif
|
|
|
20333d |
diff --git a/server/red_worker.c b/server/red_worker.c
|
|
|
20333d |
index b3a957e..b93796c 100644
|
|
|
20333d |
--- a/server/red_worker.c
|
|
|
20333d |
+++ b/server/red_worker.c
|
|
|
20333d |
@@ -11138,7 +11138,7 @@ static inline void red_cursor_reset(RedWorker *worker)
|
|
|
20333d |
if (!worker->cursor_channel->common.during_target_migrate) {
|
|
|
20333d |
red_pipes_add_verb(&worker->cursor_channel->common.base, SPICE_MSG_CURSOR_RESET);
|
|
|
20333d |
}
|
|
|
20333d |
- red_wait_all_sent(&worker->cursor_channel->common.base);
|
|
|
20333d |
+ red_channel_wait_all_sent(&worker->cursor_channel->common.base);
|
|
|
20333d |
}
|
|
|
20333d |
}
|
|
|
20333d |
|
|
|
20333d |
@@ -11421,8 +11421,8 @@ void handle_dev_stop(void *opaque, void *payload)
|
|
|
20333d |
* purge the pipe, send destroy_all_surfaces
|
|
|
20333d |
* to the client (there is no such message right now), and start
|
|
|
20333d |
* from scratch on the destination side */
|
|
|
20333d |
- red_wait_all_sent(&worker->display_channel->common.base);
|
|
|
20333d |
- red_wait_all_sent(&worker->cursor_channel->common.base);
|
|
|
20333d |
+ red_channel_wait_all_sent(&worker->display_channel->common.base);
|
|
|
20333d |
+ red_channel_wait_all_sent(&worker->cursor_channel->common.base);
|
|
|
20333d |
}
|
|
|
20333d |
|
|
|
20333d |
static int display_channel_wait_for_migrate_data(DisplayChannel *display)
|