From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etWoC-0004sS-Ay for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etWoB-00069a-52 for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:32 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44642 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etWoB-00069G-14 for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:31 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F308EBFE6 for ; Wed, 7 Mar 2018 11:00:30 +0000 (UTC) From: Juan Quintela Date: Wed, 7 Mar 2018 11:59:55 +0100 Message-Id: <20180307110010.2205-10-quintela@redhat.com> In-Reply-To: <20180307110010.2205-1-quintela@redhat.com> References: <20180307110010.2205-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH v10 09/24] migration: Set error state in case of error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com Signed-off-by: Juan Quintela --- migration/ram.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 3b6c077964..4a56a85d53 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -414,6 +414,16 @@ static void terminate_multifd_send_threads(Error *errp) { int i; + if (errp) { + MigrationState *s = migrate_get_current(); + migrate_set_error(s, errp); + if (s->state == MIGRATION_STATUS_SETUP || + s->state == MIGRATION_STATUS_ACTIVE) { + migrate_set_state(&s->state, s->state, + MIGRATION_STATUS_FAILED); + } + } + for (i = 0; i < multifd_send_state->count; i++) { MultiFDSendParams *p = &multifd_send_state->params[i]; @@ -514,6 +524,16 @@ static void terminate_multifd_recv_threads(Error *errp) { int i; + if (errp) { + MigrationState *s = migrate_get_current(); + migrate_set_error(s, errp); + if (s->state == MIGRATION_STATUS_SETUP || + s->state == MIGRATION_STATUS_ACTIVE) { + migrate_set_state(&s->state, s->state, + MIGRATION_STATUS_FAILED); + } + } + for (i = 0; i < multifd_recv_state->count; i++) { MultiFDRecvParams *p = &multifd_recv_state->params[i]; -- 2.14.3