diff options
author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 14:36:46 -0600 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
commit | 25caa4823de23448f9d59e41314ec53074fa373a (patch) | |
tree | 7d45240da2bd35350241bab3a52ae3d201d38f7c | |
parent | 0476e9d28b2a323585e9095d616b3edc8828fc33 (diff) | |
download | spice-25caa4823de23448f9d59e41314ec53074fa373a.tar.gz spice-25caa4823de23448f9d59e41314ec53074fa373a.tar.xz spice-25caa4823de23448f9d59e41314ec53074fa373a.zip |
Change reds_disconnect() to take RedsState arg
-rw-r--r-- | server/reds.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/reds.c b/server/reds.c index 7203e344..f0495c0d 100644 --- a/server/reds.c +++ b/server/reds.c @@ -519,7 +519,7 @@ void reds_client_disconnect(RedsState *reds, RedClient *client) // TODO: go over all usage of reds_disconnect, most/some of it should be converted to // reds_client_disconnect -static void reds_disconnect(void) +static void reds_disconnect(RedsState *reds) { RingItem *link, *next; @@ -533,7 +533,7 @@ static void reds_disconnect(void) static void reds_mig_disconnect(void) { if (reds_main_channel_connected(reds)) { - reds_disconnect(); + reds_disconnect(reds); } else { reds_mig_cleanup(reds); } @@ -1593,7 +1593,7 @@ static void reds_handle_main_link(RedLinkInfo *link) link_mess = link->link_mess; if (!reds->allow_multiple_clients) { - reds_disconnect(); + reds_disconnect(reds); } if (link_mess->connection_id == 0) { @@ -2659,7 +2659,7 @@ static inline void on_activating_ticketing(void) { if (!ticketing_enabled && reds_main_channel_connected(reds)) { spice_warning("disconnecting"); - reds_disconnect(); + reds_disconnect(reds); } } @@ -2905,7 +2905,7 @@ static SpiceCharDeviceState *attach_to_red_agent(SpiceCharDeviceInstance *sin) if (!client_added) { spice_warning("failed to add client to agent"); - reds_disconnect(); + reds_disconnect(reds); } } @@ -3478,7 +3478,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_ticket(SpiceServer *s, return -1; } if (disconnect_if_connected) { - reds_disconnect(); + reds_disconnect(reds); } } @@ -3820,7 +3820,7 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_end(SpiceServer *s, int completed) sif = SPICE_CONTAINEROF(migration_interface->base.sif, SpiceMigrateInterface, base); if (completed && !reds->expect_migrate && reds->num_clients) { spice_warning("spice_server_migrate_info was not called, disconnecting clients"); - reds_disconnect(); + reds_disconnect(reds); ret = -1; goto complete; } |