From patchwork Fri Oct 19 13:31:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192705 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 4B5062C008F for ; Sat, 20 Oct 2012 00:54:26 +1100 (EST) Received: from localhost ([::1]:55782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPD1s-0000Qu-G1 for incoming@patchwork.ozlabs.org; Fri, 19 Oct 2012 09:54:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPChT-0005tY-B3 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPChL-0006TJ-6z for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:17 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPChL-0006Qo-08 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:11 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so437208pbb.4 for ; Fri, 19 Oct 2012 06:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=rcw3Vx/GRHLB4wpjsdq86DGu2bt4prC9/Y8OGPxYsOY=; b=ftXQRORv9GbyJB2/63IF3N/XtSHQGj9NkTHaubcDjrbXfv/YmNXfltfHgmQPlo1vgm KZIXICpwpGC9FBcMmI2vGgAC6ULSKZDEeZ7L21KbYRZkhAg8vb8fMeH8BU9eC2P82JmG mR/vI9Kkdty52r/Meh7il7qLDFrSbeA8Yqfy3LHfchi+2QNpRtJOmaqJ773YibdK1Ini dz7yFzEtBhBM5/6BDmYb+0xo/NABFyWBfwThtgIC8HAL0EPECVSXpYuaEOLUKjbH/D+Z htFztNAl8eRu+iTVBlVnApkYw/qp9Jwgb1xIJxCK4ALezXN5O7QZ7BPUgYDCHKuG4FMG 9QUw== Received: by 10.66.88.197 with SMTP id bi5mr3819811pab.58.1350653590649; Fri, 19 Oct 2012 06:33:10 -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 kr4sm1240726pbc.76.2012.10.19.06.33.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 06:33:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2012 15:31:48 +0200 Message-Id: <1350653528-5834-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> References: <1350653528-5834-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.160.45 Subject: [Qemu-devel] [PATCH 09/29] migration (incoming): add error propagation to 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 And remove the superfluous integer return value. Reviewed-by: Luiz Capitulino Signed-off-by: Paolo Bonzini --- migration-exec.c | 8 +++----- migration-fd.c | 8 +++----- migration-tcp.c | 7 ++----- migration-unix.c | 5 ++--- migration.c | 15 ++++++--------- migration.h | 10 +++++----- vl.c | 16 ++++++---------- 7 file modificati, 27 inserzioni(+), 42 rimozioni(-) diff --git a/migration-exec.c b/migration-exec.c index 5f3f4b2..519af57 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -92,19 +92,17 @@ static void exec_accept_incoming_migration(void *opaque) qemu_fclose(f); } -int exec_start_incoming_migration(const char *command) +void exec_start_incoming_migration(const char *command, Error **errp) { QEMUFile *f; DPRINTF("Attempting to start an incoming migration\n"); f = qemu_popen_cmd(command, "r"); if(f == NULL) { - DPRINTF("Unable to apply qemu wrapper to popen file\n"); - return -errno; + error_setg_errno(errp, errno, "failed to popen the migration source"); + return; } qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, exec_accept_incoming_migration, NULL, f); - - return 0; } diff --git a/migration-fd.c b/migration-fd.c index a7c800a..ce6932d 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -97,7 +97,7 @@ static void fd_accept_incoming_migration(void *opaque) qemu_fclose(f); } -int fd_start_incoming_migration(const char *infd) +void fd_start_incoming_migration(const char *infd, Error **errp) { int fd; QEMUFile *f; @@ -107,11 +107,9 @@ int fd_start_incoming_migration(const char *infd) fd = strtol(infd, NULL, 0); f = qemu_fdopen(fd, "rb"); if(f == NULL) { - DPRINTF("Unable to apply qemu wrapper to file descriptor\n"); - return -errno; + error_setg_errno(errp, errno, "failed to open the source descriptor"); + return; } qemu_set_fd_handler2(fd, NULL, fd_accept_incoming_migration, NULL, f); - - return 0; } diff --git a/migration-tcp.c b/migration-tcp.c index 5e54e68..46f6ac5 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -111,18 +111,15 @@ out2: close(s); } -int tcp_start_incoming_migration(const char *host_port, Error **errp) +void tcp_start_incoming_migration(const char *host_port, Error **errp) { int s; s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0, errp); - if (s < 0) { - return -1; + return; } qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL, (void *)(intptr_t)s); - - return 0; } diff --git a/migration-unix.c b/migration-unix.c index 34a413a..ed3db3a 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -111,16 +111,15 @@ out2: close(s); } -int unix_start_incoming_migration(const char *path, Error **errp) +void unix_start_incoming_migration(const char *path, Error **errp) { int s; s = unix_listen(path, NULL, 0, errp); if (s < 0) { - return -1; + return; } qemu_set_fd_handler2(s, NULL, unix_accept_incoming_migration, NULL, (void *)(intptr_t)s); - return 0; } diff --git a/migration.c b/migration.c index f7f0138..2802918 100644 --- a/migration.c +++ b/migration.c @@ -64,26 +64,23 @@ static MigrationState *migrate_get_current(void) return ¤t_migration; } -int qemu_start_incoming_migration(const char *uri, Error **errp) +void qemu_start_incoming_migration(const char *uri, Error **errp) { const char *p; - int ret; if (strstart(uri, "tcp:", &p)) - ret = tcp_start_incoming_migration(p, errp); + tcp_start_incoming_migration(p, errp); #if !defined(WIN32) else if (strstart(uri, "exec:", &p)) - ret = exec_start_incoming_migration(p); + exec_start_incoming_migration(p, errp); else if (strstart(uri, "unix:", &p)) - ret = unix_start_incoming_migration(p, errp); + unix_start_incoming_migration(p, errp); else if (strstart(uri, "fd:", &p)) - ret = fd_start_incoming_migration(p); + fd_start_incoming_migration(p, errp); #endif else { - fprintf(stderr, "unknown migration protocol: %s\n", uri); - ret = -EPROTONOSUPPORT; + error_setg(errp, "unknown migration protocol: %s\n", uri); } - return ret; } void process_incoming_migration(QEMUFile *f) diff --git a/migration.h b/migration.h index 275d2d8..aa44e1b 100644 --- a/migration.h +++ b/migration.h @@ -46,7 +46,7 @@ struct MigrationState void process_incoming_migration(QEMUFile *f); -int qemu_start_incoming_migration(const char *uri, Error **errp); +void qemu_start_incoming_migration(const char *uri, Error **errp); uint64_t migrate_max_downtime(void); @@ -54,19 +54,19 @@ void do_info_migrate_print(Monitor *mon, const QObject *data); void do_info_migrate(Monitor *mon, QObject **ret_data); -int exec_start_incoming_migration(const char *host_port); +void exec_start_incoming_migration(const char *host_port, Error **errp); void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); -int tcp_start_incoming_migration(const char *host_port, Error **errp); +void tcp_start_incoming_migration(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); +void unix_start_incoming_migration(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); +void fd_start_incoming_migration(const char *path, Error **errp); void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp); diff --git a/vl.c b/vl.c index 5b357a3..2a072e8 100644 --- a/vl.c +++ b/vl.c @@ -3761,16 +3761,12 @@ int main(int argc, char **argv, char **envp) } if (incoming) { - Error *errp = NULL; - int ret = qemu_start_incoming_migration(incoming, &errp); - if (ret < 0) { - if (error_is_set(&errp)) { - fprintf(stderr, "Migrate: %s\n", error_get_pretty(errp)); - error_free(errp); - } - fprintf(stderr, "Migration failed. Exit code %s(%d), exiting.\n", - incoming, ret); - exit(ret); + Error *local_err = NULL; + qemu_start_incoming_migration(incoming, &local_err); + if (local_err) { + fprintf(stderr, "-incoming %s: %s\n", incoming, error_get_pretty(local_err)); + error_free(local_err); + exit(1); } } else if (autostart) { vm_start();