[Spice-devel] [PATCH 2/3] display: rename display_channel_wait_for_migrate_data

Frediano Ziglio fziglio at redhat.com
Wed Dec 9 05:36:52 PST 2015


Make it clean this function is handling data and not only checking
some condition.

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 server/display-channel.c | 2 +-
 server/display-channel.h | 2 +-
 server/red-worker.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/display-channel.c b/server/display-channel.c
index 6683efd..6b1043b 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -1199,7 +1199,7 @@ void display_channel_process_draw(DisplayChannel *display, RedDrawable *red_draw
     display_channel_drawable_unref(display, drawable);
 }
 
-int display_channel_wait_for_migrate_data(DisplayChannel *display)
+int display_channel_handle_migrate_data(DisplayChannel *display)
 {
     uint64_t end_time = red_get_monotonic_time() + DISPLAY_CLIENT_MIGRATE_DATA_TIMEOUT;
     RedChannel *channel = &display->common.base;
diff --git a/server/display-channel.h b/server/display-channel.h
index 7cbc58d..745ca55 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -288,7 +288,7 @@ bool                       display_channel_surface_has_canvas        (DisplayCha
                                                                       uint32_t surface_id);
 void                       display_channel_current_flush             (DisplayChannel *display,
                                                                       int surface_id);
-int                        display_channel_wait_for_migrate_data     (DisplayChannel *display);
+int                        display_channel_handle_migrate_data       (DisplayChannel *display);
 void                       display_channel_flush_all_surfaces        (DisplayChannel *display);
 void                       display_channel_free_glz_drawables_to_free(DisplayChannel *display);
 void                       display_channel_free_glz_drawables        (DisplayChannel *display);
diff --git a/server/red-worker.c b/server/red-worker.c
index baa8458..63ee839 100644
--- a/server/red-worker.c
+++ b/server/red-worker.c
@@ -973,7 +973,7 @@ static void handle_dev_start(void *opaque, void *payload)
     }
     if (worker->display_channel) {
         worker->display_channel->common.during_target_migrate = FALSE;
-        display_channel_wait_for_migrate_data(worker->display_channel);
+        display_channel_handle_migrate_data(worker->display_channel);
     }
     worker->running = TRUE;
     guest_set_client_capabilities(worker);
-- 
2.4.3



More information about the Spice-devel mailing list