[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH spice-server 12/13] server: fall back to switch host
From: |
Yonit Halperin |
Subject: |
[Qemu-devel] [PATCH spice-server 12/13] server: fall back to switch host scheme in case semi-seamless connection to target fails |
Date: |
Wed, 21 Sep 2011 18:51:22 +0300 |
Signed-off-by: Yonit Halperin <address@hidden>
---
server/reds.c | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/server/reds.c b/server/reds.c
index 76aa0ed..54c06d1 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -283,6 +283,7 @@ typedef struct RedsState {
int mig_wait_disconnect;
int mig_wait_prev_complete;
int mig_inprogress;
+ int mig_connect_ok;
int expect_migrate;
int mig_target;
RedsMigSpice *mig_spice;
@@ -1736,6 +1737,7 @@ static void reds_main_handle_message(void *opaque, size_t
size, uint32_t type, v
case SPICE_MSGC_MAIN_MIGRATE_CONNECTED:
red_printf("client connected to migration target");
if (reds->mig_wait_connect) {
+ reds->mig_connect_ok = TRUE;
reds_mig_cleanup();
}
break;
@@ -1743,6 +1745,7 @@ static void reds_main_handle_message(void *opaque, size_t
size, uint32_t type, v
// TODO: fall into switch host in case of connect error or timeout
red_printf("mig connect error");
if (reds->mig_wait_connect) {
+ reds->mig_connect_ok = FALSE;
reds_mig_cleanup();
}
break;
@@ -2172,6 +2175,7 @@ static void reds_handle_main_link(RedLinkInfo *link)
reds->mig_inprogress = FALSE;
reds->mig_wait_connect = FALSE;
reds->mig_wait_disconnect = FALSE;
+ reds->mig_connect_ok = FALSE;
reds->stream = link->stream;
reds->in_handler.shut = FALSE;
@@ -4151,8 +4155,6 @@ static void reds_mig_connect(void)
reds_push_pipe_item(item);
- reds_mig_release();
-
reds->mig_wait_connect = TRUE;
core->timer_start(reds->mig_timer, MIGRATE_TIMEOUT);
}
@@ -4194,6 +4196,7 @@ static void reds_mig_started(void)
reds_listen_stop();
sif = SPICE_CONTAINEROF(migration_interface->base.sif,
SpiceMigrateInterface, base);
+ reds->mig_connect_ok = FALSE;
if (reds->stream == NULL) {
red_printf("not connected to stream");
@@ -4227,7 +4230,7 @@ static void reds_mig_finished(int completed)
RedsOutItem *item;
red_printf("");
-
+ reds_mig_release();
if (reds->stream == NULL) {
red_printf("no stream connected");
return;
@@ -4298,7 +4301,12 @@ static void migrate_timeout(void *opaque)
{
red_printf("");
ASSERT(reds->mig_wait_connect || reds->mig_wait_disconnect ||
reds->mig_wait_prev_complete);
- reds_mig_disconnect();
+ if (reds->mig_wait_connect) {
+ reds->mig_connect_ok = FALSE;
+ reds_mig_cleanup();
+ } else {
+ reds_mig_disconnect();
+ }
}
static void key_modifiers_sender(void *opaque)
@@ -5188,7 +5196,7 @@ SPICE_GNUC_VISIBLE int
spice_server_migrate_end(SpiceServer *s, int completed)
goto complete;
}
- if (reds->client_semi_mig_cap) {
+ if (reds->client_semi_mig_cap && reds->mig_connect_ok) {
reds_mig_finished(completed);
} else {
ret = spice_server_migrate_switch(s);
--
1.7.4.4
- [Qemu-devel] [PATCH spice-server 07/13] server: move SPICE_MSG_MAIN_INIT sending code to a separate routine, (continued)
- [Qemu-devel] [PATCH spice-server 07/13] server: move SPICE_MSG_MAIN_INIT sending code to a separate routine, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 08/13] server: move the linking of channels to a separate routine, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 09/13] server: handling semi-seamless migration in the target side, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 11/13] server: turn spice_server_migrate_start into a valid call, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 13/13] Release 0.8.3, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 04/13] server, proto: tell the client to connect to the migration target before migraton starts, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 01/13] server/spice.h: semi-seamless migration interface, RHBZ #738266, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 12/13] server: fall back to switch host scheme in case semi-seamless connection to target fails,
Yonit Halperin <=
- [Qemu-devel] [PATCH spice-server 10/13] server: call migrate_connect_complete callback when no client is connected, Yonit Halperin, 2011/09/21
- [Qemu-devel] [PATCH spice-server 02/13] server: handle migration interface addition, Yonit Halperin, 2011/09/21
- Re: [Qemu-devel] [PATCH spice-server 00/13] semi-seamless migration v2 (RHBZ #738266, 725009), Alon Levy, 2011/09/22