[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 03/12] migration: Make migrate_fd_error() the own
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v9 03/12] migration: Make migrate_fd_error() the owner of the Error |
Date: |
Wed, 4 Oct 2017 12:46:27 +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 468f51cfa7..61b7e7105a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1079,16 +1079,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);
@@ -1362,7 +1360,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 51c0ac2e71..cc196cc87f 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 v9 00/12] Multifd, Juan Quintela, 2017/10/04
- [Qemu-devel] [PATCH v9 01/12] qapi: Fix grammar in x-multifd-page-count descriptions, Juan Quintela, 2017/10/04
- [Qemu-devel] [PATCH v9 02/12] migration: Improve migration thread error handling, Juan Quintela, 2017/10/04
- [Qemu-devel] [PATCH v9 03/12] migration: Make migrate_fd_error() the owner of the Error,
Juan Quintela <=
- [Qemu-devel] [PATCH v9 04/12] migration: Start of multiple fd work, Juan Quintela, 2017/10/04
- [Qemu-devel] [PATCH v9 06/12] migration: Send the fd number which we are going to use for this page, Juan Quintela, 2017/10/04
- [Qemu-devel] [PATCH v9 07/12] migration: Create thread infrastructure for multifd recv side, Juan Quintela, 2017/10/04