From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 08/29] migration (outgoing): add error propagation for all protocols
Date: Fri, 19 Oct 2012 15:31:47 +0200 [thread overview]
Message-ID: <1350653528-5834-9-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1350653528-5834-1-git-send-email-pbonzini@redhat.com>
Error propagation is already there for socket backends. Add it to other
protocols, simplifying code that tests for errors that will never happen.
With all protocols understanding Error, the code can be simplified
further by removing the return value.
Unfortunately, the quality of error messages varies depending
on where the error is detected, because no Error is passed to the
NonBlockingConnectHandler. Thus, the exact error message still cannot
be sent to the user if the OS reports it asynchronously via SO_ERROR.
If NonBlockingConnectHandler received an Error**, we could for
example report the error class and/or message via a new field of the
query-migration command even if it is reported asynchronously.
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 <pbonzini@redhat.com>
---
migration-exec.c | 18 ++++--------------
migration-fd.c | 19 ++++---------------
migration-tcp.c | 13 ++-----------
migration-unix.c | 11 ++---------
migration.c | 17 ++++++-----------
migration.h | 9 ++++-----
6 file modificati, 22 inserzioni(+), 65 rimozioni(-)
diff --git a/migration-exec.c b/migration-exec.c
index 6c97db9..5f3f4b2 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -60,22 +60,18 @@ 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;
+ error_setg_errno(errp, errno, "failed to popen the migration target");
+ return;
}
s->fd = fileno(f);
- if (s->fd == -1) {
- DPRINTF("Unable to retrieve file descriptor for popen'd handle\n");
- goto err_after_open;
- }
-
+ assert(s->fd != -1);
socket_set_nonblock(s->fd);
s->opaque = qemu_popen(f, "w");
@@ -85,12 +81,6 @@ int exec_start_outgoing_migration(MigrationState *s, const char *command)
s->write = file_write;
migrate_fd_connect(s);
- return 0;
-
-err_after_open:
- pclose(f);
-err_after_popen:
- return -1;
}
static void exec_accept_incoming_migration(void *opaque)
diff --git a/migration-fd.c b/migration-fd.c
index 7335167..a7c800a 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -73,30 +73,19 @@ 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;
- }
-
- if (fcntl(s->fd, F_SETFL, O_NONBLOCK) == -1) {
- DPRINTF("Unable to set nonblocking mode on file descriptor\n");
- goto err_after_open;
+ return;
}
+ fcntl(s->fd, F_SETFL, O_NONBLOCK);
s->get_error = fd_errno;
s->write = fd_write;
s->close = fd_close;
migrate_fd_connect(s);
- return 0;
-
-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);
--
1.7.12.1
next prev parent reply other threads:[~2012-10-19 13:33 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-19 13:31 [Qemu-devel] [PULL 00/29] qemu-sockets error propagation + NBD server Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 01/29] error: add error_set_errno and error_setg_errno Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 02/29] qemu-sockets: add Error ** to all functions Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 03/29] qemu-sockets: unix_listen and unix_connect are portable Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 04/29] qemu-sockets: add nonblocking connect for Unix sockets Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 05/29] migration: avoid using error_is_set and thus relying on errp != NULL Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 06/29] migration: centralize call to migrate_fd_error() Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 07/29] migration: use qemu-sockets to establish Unix sockets Paolo Bonzini
2012-10-19 13:31 ` Paolo Bonzini [this message]
2012-10-22 15:52 ` [Qemu-devel] [PATCH 08/29] migration (outgoing): add error propagation for all protocols Markus Armbruster
2012-10-23 11:27 ` Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 09/29] migration (incoming): add error propagation to fd and exec protocols Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 10/29] qemu-char: ask and print error information from qemu-sockets Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 11/29] nbd: " Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 12/29] qemu-ga: " Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 13/29] vnc: avoid Yoda conditionals Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 14/29] vnc: introduce a single label for error returns Paolo Bonzini
2012-10-22 15:49 ` Markus Armbruster
2012-10-23 11:32 ` Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 15/29] vnc: reorganize code for reverse mode Paolo Bonzini
2012-10-22 15:39 ` Markus Armbruster
2012-10-19 13:31 ` [Qemu-devel] [PATCH 16/29] vnc: add error propagation to vnc_display_open Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 17/29] qemu-sockets: include strerror or gai_strerror output in error messages Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 18/29] qemu-sockets: add error propagation to inet_connect_addr Paolo Bonzini
2012-10-22 15:53 ` Markus Armbruster
2012-10-19 13:31 ` [Qemu-devel] [PATCH 19/29] qemu-sockets: add error propagation to inet_dgram_opts Paolo Bonzini
2012-10-19 13:31 ` [Qemu-devel] [PATCH 20/29] qemu-sockets: add error propagation to inet_parse Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 21/29] qemu-sockets: add error propagation to Unix socket functions Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 22/29] vnc: drop QERR_VNC_SERVER_FAILED Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 23/29] build: add QAPI files to the tools Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 24/29] qapi: add socket address types Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 25/29] qemu-sockets: return InetSocketAddress from inet_parse Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 26/29] qemu-sockets: add socket_listen, socket_connect, socket_parse Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 27/29] block: prepare code for adding block notifiers Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 28/29] block: add close notifiers Paolo Bonzini
2012-10-19 13:32 ` [Qemu-devel] [PATCH 29/29] qmp: add NBD server commands Paolo Bonzini
2012-10-22 15:59 ` [Qemu-devel] [PULL 00/29] qemu-sockets error propagation + NBD server Markus Armbruster
2012-10-22 19:53 ` Anthony Liguori
2012-10-23 12:34 ` Paolo Bonzini
2012-10-23 15:27 ` Paolo Bonzini
2012-10-23 21:24 ` Paolo Bonzini
2012-10-26 15:33 ` Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350653528-5834-9-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).