[Spice-devel] [PATCH 07/15] Change reds_send_mm_time() to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Wed Jan 20 05:25:19 PST 2016


From: Jonathon Jongsma <jjongsma at redhat.com>

---
 server/reds.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/reds.c b/server/reds.c
index d8ee53d..a2e1542 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -210,7 +210,7 @@ static void reds_mig_cleanup_wait_disconnect(void);
 static void reds_mig_remove_wait_disconnect_client(RedClient *client);
 static void reds_char_device_add_state(SpiceCharDeviceState *st);
 static void reds_char_device_remove_state(SpiceCharDeviceState *st);
-static void reds_send_mm_time(void);
+static void reds_send_mm_time(RedsState *reds);
 
 static VDIReadBuf *vdi_port_read_buf_get(RedsState *reds);
 static VDIReadBuf *vdi_port_read_buf_ref(VDIReadBuf *buf);
@@ -1346,7 +1346,7 @@ int reds_handle_migrate_data(RedsState *reds, MainChannelClient *mcc,
      * (MSG_MAIN_INIT is not sent for a migrating connection)
      */
     if (reds->mm_time_enabled) {
-        reds_send_mm_time();
+        reds_send_mm_time(reds);
     }
     if (mig_data->agent_base.connected) {
         if (agent_state->base) { // agent was attached before migration data has arrived
@@ -2543,7 +2543,7 @@ listen:
     return slisten;
 }
 
-static void reds_send_mm_time(void)
+static void reds_send_mm_time(RedsState *reds)
 {
     if (!reds_main_channel_connected(reds)) {
         return;
@@ -2560,7 +2560,7 @@ void reds_set_client_mm_time_latency(RedClient *client, uint32_t latency)
         // TODO: consider network latency
         if (latency > reds->mm_time_latency) {
             reds->mm_time_latency = latency;
-            reds_send_mm_time();
+            reds_send_mm_time(reds);
         } else {
             spice_debug("new latency %u is smaller than existing %u",
                         latency, reds->mm_time_latency);
@@ -2966,7 +2966,7 @@ void reds_enable_mm_time(void)
 {
     reds->mm_time_enabled = TRUE;
     reds->mm_time_latency = MM_TIME_DELTA;
-    reds_send_mm_time();
+    reds_send_mm_time(reds);
 }
 
 void reds_disable_mm_time(void)
-- 
2.4.3



More information about the Spice-devel mailing list