[Spice-devel] [PATCH 14/15] Change reds_mig_release to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Wed Jan 20 05:25:26 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 e47c694..67b2071 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2830,7 +2830,7 @@ typedef struct RedsMigCertPubKeyInfo {
     uint32_t len;
 } RedsMigCertPubKeyInfo;
 
-static void reds_mig_release(void)
+static void reds_mig_release(RedsState *reds)
 {
     if (reds->mig_spice) {
         free(reds->mig_spice->cert_subject);
@@ -2929,7 +2929,7 @@ static void reds_mig_finished(int completed)
     } else {
         reds_mig_cleanup(reds);
     }
-    reds_mig_release();
+    reds_mig_release(reds);
 }
 
 static void reds_mig_switch(void)
@@ -2939,7 +2939,7 @@ static void reds_mig_switch(void)
         return;
     }
     main_channel_migrate_switch(reds->main_channel, reds->mig_spice);
-    reds_mig_release();
+    reds_mig_release(reds);
 }
 
 static void migrate_timeout(void *opaque)
@@ -3843,7 +3843,7 @@ static int reds_set_migration_dest_info(const char* dest,
 {
     RedsMigSpice *spice_migration = NULL;
 
-    reds_mig_release();
+    reds_mig_release(reds);
     if ((port == -1 && secure_port == -1) || !dest) {
         return FALSE;
     }
@@ -3904,7 +3904,7 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_connect(SpiceServer *s, const char*
         reds_mig_started();
     } else {
         if (reds->num_clients == 0) {
-            reds_mig_release();
+            reds_mig_release(reds);
             spice_info("no client connected");
         }
         sif->migrate_connect_complete(migration_interface);
-- 
2.4.3



More information about the Spice-devel mailing list