summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYonit Halperin <yhalperi@redhat.com>2012-12-05 12:34:28 -0500
committerYonit Halperin <yhalperi@redhat.com>2012-12-05 12:49:41 -0500
commit5c91735b2c81a47cf88c84256f4d36a888923549 (patch)
tree5e6cb9faa61705f8ad4d76f1ebe52d7c2283942d
parent069270f641b617538c17b64d4bebfd4ccb51c6dc (diff)
downloadspice-5c91735b2c81a47cf88c84256f4d36a888923549.tar.gz
spice-5c91735b2c81a47cf88c84256f4d36a888923549.tar.xz
spice-5c91735b2c81a47cf88c84256f4d36a888923549.zip
red_worker: revert 8855438a
red_proccess_commands calls were added after calling guest_set_client_capabilities in order to cleanup the command ring from old commands that the client might not be able to handle. However, calling red_process_commands at this stage does send messages to the client. In addition, since setting the client capabilities at the guest is not synchronized, emptying the command ring is not enough in order to make sure the following commands will be supported by the client. The call to red_proccess_commands before initializing the display streams (the call to red_display_start_streams), caused inconsistencies related to video streaming upon reconnecting (rhbz#883564). I'm reverting this patch till another solution for the capabilities mismatch is introduced. Resolves: rhbz#883564
-rw-r--r--server/red_worker.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index 8f7f45a2..530562bb 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -9515,11 +9515,6 @@ static void on_new_display_channel_client(DisplayChannelClient *dcc)
}
red_channel_client_ack_zero_messages_window(&dcc->common.base);
if (worker->surfaces[0].context.canvas) {
- int ring_is_empty;
-
- while (red_process_commands(worker, MAX_PIPE_SIZE, &ring_is_empty)) {
- }
-
red_current_flush(worker, 0);
push_new_primary_surface(dcc);
red_push_surface_image(dcc, 0);