summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2015-01-16 16:47:30 -0600
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-02-23 23:00:43 +0100
commit2d32eff044ff431d9a1ff815e5e46ad7fe888a14 (patch)
treed285821567e7b3575cf845fa9a3dac9dc1b7a51d
parent1b68eff7ec3cc2037f522be863aaf6fa61849f51 (diff)
downloadspice-2d32eff044ff431d9a1ff815e5e46ad7fe888a14.tar.gz
spice-2d32eff044ff431d9a1ff815e5e46ad7fe888a14.tar.xz
spice-2d32eff044ff431d9a1ff815e5e46ad7fe888a14.zip
Change reds_mig_target_client_find() to take RedsState arg
-rw-r--r--server/reds.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/server/reds.c b/server/reds.c
index 4ff0619e..3b5263e6 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -148,7 +148,7 @@ struct ChannelSecurityOptions {
};
static void migrate_timeout(void *opaque);
-static RedsMigTargetClient* reds_mig_target_client_find(RedClient *client);
+static RedsMigTargetClient* reds_mig_target_client_find(RedsState *reds, RedClient *client);
static void reds_mig_target_client_free(RedsMigTargetClient *mig_client);
static void reds_mig_cleanup_wait_disconnect(void);
static void reds_mig_remove_wait_disconnect_client(RedClient *client);
@@ -456,7 +456,7 @@ void reds_client_disconnect(RedsState *reds, RedClient *client)
// TODO: we need to handle agent properly for all clients!!!! (e.g., cut and paste, how?)
// We shouldn't initialize the agent when there are still clients connected
- mig_client = reds_mig_target_client_find(client);
+ mig_client = reds_mig_target_client_find(reds, client);
if (mig_client) {
reds_mig_target_client_free(mig_client);
}
@@ -1500,7 +1500,7 @@ static void reds_mig_target_client_add(RedsState *reds, RedClient *client)
}
-static RedsMigTargetClient* reds_mig_target_client_find(RedClient *client)
+static RedsMigTargetClient* reds_mig_target_client_find(RedsState *reds, RedClient *client)
{
RingItem *item;
@@ -1727,7 +1727,7 @@ static int reds_link_mig_target_channels(RedClient *client)
RingItem *item;
spice_info("%p", client);
- mig_client = reds_mig_target_client_find(client);
+ mig_client = reds_mig_target_client_find(reds, client);
if (!mig_client) {
spice_info("Error: mig target client was not found");
return FALSE;
@@ -1832,7 +1832,7 @@ static void reds_handle_other_links(RedLinkInfo *link)
reds_info_new_channel(link, link_mess->connection_id);
reds_stream_remove_watch(link->stream);
- mig_client = reds_mig_target_client_find(client);
+ mig_client = reds_mig_target_client_find(reds, client);
/*
* In semi-seamless migration, we activate the channels only
* after migration is completed. Since, the session starts almost from