[Spice-commits] server/display-channel.c server/red-worker.c
Frediano Ziglio
fziglio at kemper.freedesktop.org
Wed Dec 9 03:44:26 PST 2015
server/display-channel.c | 7 +++++--
server/red-worker.c | 4 +---
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit c0f4de5c860a3c28fcfb0b7c2e0d97726fc91908
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date: Thu Sep 26 23:05:06 2013 +0200
display: replace some dubious asserts
Signed-off-by: Marc-André Lureau <marcandre.lureau at gmail.com>
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Jonathon Jongsma <jjongsma at redhat.com>
Acked-by: Uri Lublin <uril at redhat.com>
diff --git a/server/display-channel.c b/server/display-channel.c
index f0ff2bd..32d87af 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -1205,11 +1205,14 @@ int display_channel_wait_for_migrate_data(DisplayChannel *display)
RedChannel *channel = &display->common.base;
RedChannelClient *rcc;
+ if (!red_channel_waits_for_migrate_data(&display->common.base)) {
+ return FALSE;
+ }
+
spice_debug(NULL);
- spice_assert(channel->clients_num == 1);
+ spice_warn_if_fail(channel->clients_num == 1);
rcc = SPICE_CONTAINEROF(ring_get_head(&channel->clients), RedChannelClient, channel_link);
- spice_assert(red_channel_client_waits_for_migrate_data(rcc));
for (;;) {
red_channel_client_receive(rcc);
diff --git a/server/red-worker.c b/server/red-worker.c
index 84f9ad0..baa8458 100644
--- a/server/red-worker.c
+++ b/server/red-worker.c
@@ -973,9 +973,7 @@ static void handle_dev_start(void *opaque, void *payload)
}
if (worker->display_channel) {
worker->display_channel->common.during_target_migrate = FALSE;
- if (red_channel_waits_for_migrate_data(&worker->display_channel->common.base)) {
- display_channel_wait_for_migrate_data(worker->display_channel);
- }
+ display_channel_wait_for_migrate_data(worker->display_channel);
}
worker->running = TRUE;
guest_set_client_capabilities(worker);
More information about the Spice-commits
mailing list