summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-12-14 12:58:26 +0100
committerGerd Hoffmann <kraxel@redhat.com>2010-12-16 09:17:35 +0100
commit215cd7f90314788fb8f6a9625bb788ece274a716 (patch)
tree3be5a116da9696296bbe7c5434c8b3aeea0b39b6
parent697c91db808446e1422dc5593c9f040e373e40bb (diff)
downloadspice-215cd7f90314788fb8f6a9625bb788ece274a716.tar.gz
spice-215cd7f90314788fb8f6a9625bb788ece274a716.tar.xz
spice-215cd7f90314788fb8f6a9625bb788ece274a716.zip
move switch-host migration out of experimental
seamless stays in the experimental area. comments updates too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> (cherry picked from commit 6acb817071daa13b8389bfce12cac6221997cebe)
-rw-r--r--server/spice-experimental.h6
-rw-r--r--server/spice.h7
2 files changed, 8 insertions, 5 deletions
diff --git a/server/spice-experimental.h b/server/spice-experimental.h
index 70d22468..f1b7385c 100644
--- a/server/spice-experimental.h
+++ b/server/spice-experimental.h
@@ -53,7 +53,7 @@ struct SpiceNetWireInstance {
void spice_server_net_wire_recv_packet(SpiceNetWireInstance *sin,
const uint8_t *pkt, int len);
-/* spice client migration */
+/* spice seamless client migration (broken) */
enum {
SPICE_MIGRATE_CLIENT_NONE = 1,
@@ -61,13 +61,9 @@ enum {
SPICE_MIGRATE_CLIENT_READY,
};
-int spice_server_migrate_info(SpiceServer *s, const char* dest,
- int port, int secure_port,
- const char* cert_subject);
int spice_server_migrate_start(SpiceServer *s);
int spice_server_migrate_client_state(SpiceServer *s);
int spice_server_migrate_end(SpiceServer *s, int completed);
-int spice_server_migrate_switch(SpiceServer *s);
#endif // __SPICE_EXPERIMENTAL_H__
diff --git a/server/spice.h b/server/spice.h
index 898a32db..87303ab9 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -404,4 +404,11 @@ int spice_server_set_agent_mouse(SpiceServer *s, int enable);
int spice_server_get_sock_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen);
int spice_server_get_peer_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen);
+/* spice switch-host client migration */
+
+int spice_server_migrate_info(SpiceServer *s, const char* dest,
+ int port, int secure_port,
+ const char* cert_subject);
+int spice_server_migrate_switch(SpiceServer *s);
+
#endif