[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 02/15] migration: In case of error just end the
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v11 02/15] migration: In case of error just end the migration |
Date: |
Fri, 16 Mar 2018 12:53:50 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
--
As requested, just continue connection in case of error.
---
migration/socket.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/migration/socket.c b/migration/socket.c
index 52db0c0c09..8dda1d9a98 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -140,9 +140,7 @@ static gboolean socket_accept_incoming_migration(QIOChannel
*ioc,
sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
&err);
if (!sioc) {
- error_report("could not accept migration connection (%s)",
- error_get_pretty(err));
- goto out;
+ return G_SOURCE_CONTINUE;
}
trace_migration_socket_incoming_accepted();
@@ -151,7 +149,6 @@ static gboolean socket_accept_incoming_migration(QIOChannel
*ioc,
migration_channel_process_incoming(QIO_CHANNEL(sioc));
object_unref(OBJECT(sioc));
-out:
if (migration_has_all_channels()) {
/* Close listening socket as its no longer needed */
qio_channel_close(ioc, NULL);
--
2.14.3
- [Qemu-devel] [RFC v11 00/15] mutifd, Juan Quintela, 2018/03/16
- [Qemu-devel] [PATCH v11 02/15] migration: In case of error just end the migration,
Juan Quintela <=
- [Qemu-devel] [PATCH v11 05/15] migration: Be sure all recv channels are created, Juan Quintela, 2018/03/16
- [Qemu-devel] [PATCH v11 06/15] migration: Export functions to create send channels, Juan Quintela, 2018/03/16
- [Qemu-devel] [PATCH v11 01/15] migration: Set error state in case of error, Juan Quintela, 2018/03/16
- [Qemu-devel] [PATCH v11 08/15] migration: Synchronize recv threads, Juan Quintela, 2018/03/16
- [Qemu-devel] [PATCH v11 09/15] migration: Add multifd traces for start/end thread, Juan Quintela, 2018/03/16