[Spice-devel] [PATCH migration 14/19] client: main channel migration: do partial cleanup when switching hosts
Yonit Halperin
yhalperi at redhat.com
Wed Oct 12 03:39:04 PDT 2011
Implement on_disconnect_mig_src and on_connect_mig_target in order to avoid
unnecessary cleanups done in on_(disconnet|connect).
In addition, do not request guest display settings changes after migration.
(cherry picked from commit f91d202eb3bf631cf5e70277d1aabffec7da9393 branch 0.8)
Signed-off-by: Yonit Halperin <yhalperi at redhat.com>
---
client/red_client.cpp | 9 +++++++++
client/red_client.h | 2 ++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/client/red_client.cpp b/client/red_client.cpp
index 84440c1..4fc442f 100644
--- a/client/red_client.cpp
+++ b/client/red_client.cpp
@@ -498,6 +498,15 @@ void RedClient::on_disconnect()
(*sync_event)->wait();
}
+void RedClient::on_disconnect_mig_src()
+{
+ _application.deactivate_interval_timer(*_agent_timer);
+ delete[] _agent_msg_data;
+ _agent_msg_data = NULL;
+ _agent_msg_pos = 0;
+ _agent_tokens = 0;
+}
+
void RedClient::delete_channels()
{
Lock lock(_channels_lock);
diff --git a/client/red_client.h b/client/red_client.h
index 7b3e507..20d5ffb 100644
--- a/client/red_client.h
+++ b/client/red_client.h
@@ -279,6 +279,8 @@ protected:
virtual void on_connecting();
virtual void on_connect();
virtual void on_disconnect();
+ virtual void on_connect_mig_target() {}
+ virtual void on_disconnect_mig_src();
private:
void on_channel_disconnected(RedChannel& channel);
--
1.7.6.4
More information about the Spice-devel
mailing list