display: replace some dubious asserts

Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Uri Lublin <uril@redhat.com>
This commit is contained in:
Marc-André Lureau 2013-09-26 23:05:06 +02:00 committed by Frediano Ziglio
parent 9956270358
commit c0f4de5c86
2 changed files with 6 additions and 5 deletions

View File

@ -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);

View File

@ -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);