[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 06/20] migration: Make migrate_fd_error() the own
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v8 06/20] migration: Make migrate_fd_error() the owner of the Error |
Date: |
Wed, 13 Sep 2017 12:59:39 +0200 |
So far, we had to free the error after each caller, so just do it
here. Once there, tls.c was leaking the error.
Signed-off-by: Juan Quintela <address@hidden>
---
migration/channel.c | 1 -
migration/migration.c | 10 ++++------
migration/migration.h | 4 ++--
migration/socket.c | 1 -
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/migration/channel.c b/migration/channel.c
index 70ec7ea3b7..1dd2ae1530 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -71,7 +71,6 @@ void migration_channel_connect(MigrationState *s,
migration_tls_channel_connect(s, ioc, hostname, &local_err);
if (local_err) {
migrate_fd_error(s, local_err);
- error_free(local_err);
}
} else {
QEMUFile *f = qemu_fopen_channel_output(ioc);
diff --git a/migration/migration.c b/migration/migration.c
index adc07e442a..b15f0ba876 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1021,16 +1021,14 @@ static void migrate_fd_cleanup(void *opaque)
block_cleanup_parameters(s);
}
-void migrate_set_error(MigrationState *s, const Error *error)
+void migrate_set_error(MigrationState *s, Error *error)
{
qemu_mutex_lock(&s->error_mutex);
- if (!s->error) {
- s->error = error_copy(error);
- }
+ error_propagate(&s->error, error);
qemu_mutex_unlock(&s->error_mutex);
}
-void migrate_fd_error(MigrationState *s, const Error *error)
+void migrate_fd_error(MigrationState *s, Error *error)
{
trace_migrate_fd_error(error_get_pretty(error));
assert(s->to_dst_file == NULL);
@@ -1304,7 +1302,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
}
if (local_err) {
- migrate_fd_error(s, local_err);
+ migrate_fd_error(s, error_copy(local_err));
error_propagate(errp, local_err);
return;
}
diff --git a/migration/migration.h b/migration/migration.h
index 9a81b8a70a..7ddb0cdc1a 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -163,8 +163,8 @@ bool migration_has_all_channels(void);
uint64_t migrate_max_downtime(void);
-void migrate_set_error(MigrationState *s, const Error *error);
-void migrate_fd_error(MigrationState *s, const Error *error);
+void migrate_set_error(MigrationState *s, Error *error);
+void migrate_fd_error(MigrationState *s, Error *error);
void migrate_fd_connect(MigrationState *s);
diff --git a/migration/socket.c b/migration/socket.c
index dee869044a..2d70747a1a 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -80,7 +80,6 @@ static void socket_outgoing_migration(QIOTask *task,
if (qio_task_propagate_error(task, &err)) {
trace_migration_socket_outgoing_error(error_get_pretty(err));
migrate_fd_error(data->s, err);
- error_free(err);
} else {
trace_migration_socket_outgoing_connected(data->hostname);
migration_channel_connect(data->s, sioc, data->hostname);
--
2.13.5
- [Qemu-devel] [PATCH v8 00/20] Multifd, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 01/20] migration: Create migration_ioc_process_incoming(), Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 03/20] migration: Add comments to channel functions, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 02/20] migration: Teach it about G_SOURCE_REMOVE, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 04/20] migration: Create migration_has_all_channels, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 05/20] migration: Improve migration thread error handling, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 06/20] migration: Make migrate_fd_error() the owner of the Error,
Juan Quintela <=
- [Qemu-devel] [PATCH v8 07/20] migration: Add multifd capability, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 08/20] migration: Create x-multifd-channels parameter, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 11/20] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 10/20] migration: Create multifd migration threads, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 12/20] migration: Start of multiple fd work, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 13/20] migration: Create ram_multifd_page, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 09/20] migration: Create x-multifd-page-count parameter, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 14/20] migration: Really use multiple pages at a time, Juan Quintela, 2017/09/13