From patchwork Wed Oct 3 14:36:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 188802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 085DD2C00C0 for ; Thu, 4 Oct 2012 01:12:26 +1000 (EST) Received: from localhost ([::1]:58747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ60-0006gT-OR for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 10:38:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ58-0004z0-RZ for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ52-0000K7-DO for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:50 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:58274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ52-0000Jw-2p for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:44 -0400 Received: by dadn15 with SMTP id n15so2455980dad.4 for ; Wed, 03 Oct 2012 07:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=S4COlq/LBJa5SZWKqhXQj1I1EvRPodDZ1f3WUCnaZQk=; b=XcgFD2iD/F3ICASZwWfzNxWFiy7U9j5VIu6/Lhyc8VODGtERkVIASDRwBmcbZz4PAp rJD13YuJq/DcpS6Ih4zD/+tEsQHsQr6t4A6BmseAD1/9QkF/yLHAIZZPQDdXcezc/G9j ryo7MEhpW32iODKl0G7iMDMbXVIZY5DVvJNh166kPFSK5d23KABkG3LilBer1UQZ90S2 UqlhbzXZqbTEOx8YTIvMfZH0SIJo3i2yjOmjMEfaHvqLh+2ft9O18sCs407/W24WWcBh 4wgEgI2mRC0vw2QiBOQOAdEZbroIyGTT9qfsVh9Gv9WCI1W3dR3Hc3LTbjiWSCaHmYNv scjQ== Received: by 10.68.217.67 with SMTP id ow3mr13574142pbc.26.1349275062696; Wed, 03 Oct 2012 07:37:42 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id i1sm2566228pay.26.2012.10.03.07.37.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Oct 2012 07:37:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2012 16:36:55 +0200 Message-Id: <1349275025-5093-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> References: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 08/18] migration (outgoing): add error propagation for fd and exec protocols X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Error propagation is already there for socket backends, but it is (and remains) incomplete because no Error is passed to the NonBlockingConnectHandler. With all protocols understanding Error, the code can be simplified by removing the return value. Before: (qemu) migrate fd:ffff migrate: An undefined error has occurred (qemu) info migrate (qemu) After: (qemu) migrate fd:ffff migrate: File descriptor named 'ffff' has not been found (qemu) info migrate capabilities: xbzrle: off Migration status: failed total time: 0 milliseconds Signed-off-by: Paolo Bonzini --- migration-exec.c | 8 +++----- migration-fd.c | 11 ++++------- migration-tcp.c | 13 ++----------- migration-unix.c | 11 ++--------- migration.c | 17 ++++++----------- migration.h | 9 ++++----- 6 file modificati, 21 inserzioni(+), 48 rimozioni(-) diff --git a/migration-exec.c b/migration-exec.c index 6c97db9..f3baf85 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -60,19 +60,17 @@ static int exec_close(MigrationState *s) return ret; } -int exec_start_outgoing_migration(MigrationState *s, const char *command) +void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) { FILE *f; f = popen(command, "w"); if (f == NULL) { - DPRINTF("Unable to popen exec target\n"); goto err_after_popen; } s->fd = fileno(f); if (s->fd == -1) { - DPRINTF("Unable to retrieve file descriptor for popen'd handle\n"); goto err_after_open; } @@ -85,12 +83,12 @@ int exec_start_outgoing_migration(MigrationState *s, const char *command) s->write = file_write; migrate_fd_connect(s); - return 0; + return; err_after_open: pclose(f); err_after_popen: - return -1; + error_setg_errno(errp, errno, "failed to popen the migration target"); } static void exec_accept_incoming_migration(void *opaque) diff --git a/migration-fd.c b/migration-fd.c index 7335167..938a109 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -73,12 +73,11 @@ static int fd_close(MigrationState *s) return 0; } -int fd_start_outgoing_migration(MigrationState *s, const char *fdname) +void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp) { - s->fd = monitor_get_fd(cur_mon, fdname, NULL); + s->fd = monitor_get_fd(cur_mon, fdname, errp); if (s->fd == -1) { - DPRINTF("fd_migration: invalid file descriptor identifier\n"); - goto err_after_get_fd; + return; } if (fcntl(s->fd, F_SETFL, O_NONBLOCK) == -1) { @@ -91,12 +90,10 @@ int fd_start_outgoing_migration(MigrationState *s, const char *fdname) s->close = fd_close; migrate_fd_connect(s); - return 0; + return; err_after_open: close(s->fd); -err_after_get_fd: - return -1; } static void fd_accept_incoming_migration(void *opaque) diff --git a/migration-tcp.c b/migration-tcp.c index e8bc76a..5e54e68 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -68,22 +68,13 @@ static void tcp_wait_for_connect(int fd, void *opaque) } } -int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, - Error **errp) +void 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, &local_err); - if (local_err != NULL) { - error_propagate(errp, local_err); - return -1; - } - - return 0; + s->fd = inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, errp); } static void tcp_accept_incoming_migration(void *opaque) diff --git a/migration-unix.c b/migration-unix.c index 5387c21..34a413a 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -68,20 +68,13 @@ static void unix_wait_for_connect(int fd, void *opaque) } } -int unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) +void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) { - Error *local_err = NULL; - s->get_error = unix_errno; s->write = unix_write; s->close = unix_close; - s->fd = unix_nonblocking_connect(path, unix_wait_for_connect, s, &local_err); - if (local_err != NULL) { - error_propagate(errp, local_err); - return -1; - } - return 0; + s->fd = unix_nonblocking_connect(path, unix_wait_for_connect, s, errp); } static void unix_accept_incoming_migration(void *opaque) diff --git a/migration.c b/migration.c index 767e297..f7f0138 100644 --- a/migration.c +++ b/migration.c @@ -485,7 +485,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, MigrationState *s = migrate_get_current(); MigrationParams params; const char *p; - int ret; params.blk = blk; params.shared = inc; @@ -507,27 +506,23 @@ 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, &local_err); + tcp_start_outgoing_migration(s, p, &local_err); #if !defined(WIN32) } else if (strstart(uri, "exec:", &p)) { - ret = exec_start_outgoing_migration(s, p); + exec_start_outgoing_migration(s, p, &local_err); } else if (strstart(uri, "unix:", &p)) { - ret = unix_start_outgoing_migration(s, p, &local_err); + unix_start_outgoing_migration(s, p, &local_err); } else if (strstart(uri, "fd:", &p)) { - ret = fd_start_outgoing_migration(s, p); + fd_start_outgoing_migration(s, p, &local_err); #endif } else { error_set(errp, QERR_INVALID_PARAMETER_VALUE, "uri", "a valid migration protocol"); return; } - if (ret < 0 || local_err) { + if (local_err) { migrate_fd_error(s); - if (!local_err) { - error_set_errno(errp, -ret, QERR_UNDEFINED_ERROR); - } else { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } diff --git a/migration.h b/migration.h index e0612a3..275d2d8 100644 --- a/migration.h +++ b/migration.h @@ -56,20 +56,19 @@ void do_info_migrate(Monitor *mon, QObject **ret_data); int exec_start_incoming_migration(const char *host_port); -int exec_start_outgoing_migration(MigrationState *s, const char *host_port); +void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); int tcp_start_incoming_migration(const char *host_port, Error **errp); -int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, - Error **errp); +void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); int unix_start_incoming_migration(const char *path, Error **errp); -int unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp); +void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp); int fd_start_incoming_migration(const char *path); -int fd_start_outgoing_migration(MigrationState *s, const char *fdname); +void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp); void migrate_fd_error(MigrationState *s);