From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4t-0004EP-DB for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ4s-0000Gr-0c for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:35 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:35087) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4r-0000GD-Qk for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:33 -0400 Received: by padfb10 with SMTP id fb10so6493677pad.4 for ; Wed, 03 Oct 2012 07:37:33 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 3 Oct 2012 16:36:52 +0200 Message-Id: <1349275025-5093-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> References: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/18] migration: avoid using error_is_set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Paolo Bonzini --- migration-tcp.c | 8 +++++--- migration.c | 13 +++++++------ 2 file modificati, 12 inserzioni(+), 9 rimozioni(-) diff --git a/migration-tcp.c b/migration-tcp.c index a15c2b8..78337a3 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -71,14 +71,16 @@ static void tcp_wait_for_connect(int fd, void *opaque) int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp) { + Error *local_err = NULL; + s->get_error = socket_errno; s->write = socket_write; s->close = tcp_close; - s->fd = inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, - errp); - if (error_is_set(errp)) { + s->fd = inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, &local_err); + if (local_err != NULL) { migrate_fd_error(s); + error_propagate(errp, local_err); return -1; } diff --git a/migration.c b/migration.c index 22a05c4..8a04174 100644 --- a/migration.c +++ b/migration.c @@ -481,6 +481,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, bool has_inc, bool inc, bool has_detach, bool detach, Error **errp) { + Error *local_err = NULL; MigrationState *s = migrate_get_current(); MigrationParams params; const char *p; @@ -506,7 +507,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, s = migrate_init(¶ms); if (strstart(uri, "tcp:", &p)) { - ret = tcp_start_outgoing_migration(s, p, errp); + ret = tcp_start_outgoing_migration(s, p, &local_err); #if !defined(WIN32) } else if (strstart(uri, "exec:", &p)) { ret = exec_start_outgoing_migration(s, p); @@ -520,11 +521,11 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, return; } - if (ret < 0) { - if (!error_is_set(errp)) { - DPRINTF("migration failed: %s\n", strerror(-ret)); - /* FIXME: we should return meaningful errors */ - error_set(errp, QERR_UNDEFINED_ERROR); + if (ret < 0 || local_err) { + if (!local_err) { + error_set_errno(errp, -ret, QERR_UNDEFINED_ERROR); + } else { + error_propagate(errp, local_err); } return; } -- 1.7.12.1