diff options
author | Amos Kong <akong@redhat.com> | 2012-05-11 00:28:35 +0800 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-10 12:37:57 -0500 |
commit | d5c5dacc7027af2acfa87f860f11d7791776301f (patch) | |
tree | 2d5c48015ab4c59c104b26824220c0c5c0d4c01a /migration-tcp.c | |
parent | 029409e5a9568e9032634847587e24bba66b252b (diff) | |
download | qemu-d5c5dacc7027af2acfa87f860f11d7791776301f.zip qemu-d5c5dacc7027af2acfa87f860f11d7791776301f.tar.gz qemu-d5c5dacc7027af2acfa87f860f11d7791776301f.tar.bz2 |
use inet_listen()/inet_connect() to support ipv6 migration
Use help functions in qemu-socket.c for tcp migration,
which already support ipv6 addresses.
Currently errp will be set to UNDEFINED_ERROR when migration fails,
qemu would output "migration failed: ...", and current user can
see a message("An undefined error has occurred") in monitor.
This patch changed tcp_start_outgoing_migration()/inet_connect()
/inet_connect_opts(), socket error would be passed back,
then current user can see a meaningful err message in monitor.
Qemu will exit if listening fails, so output socket error
to qemu stderr.
For IPv6 brackets must be mandatory if you require a port.
Referencing to RFC5952, the recommended format is:
[2312::8274]:5200
test status: Successed
listen side: qemu-kvm .... -incoming tcp:[2312::8274]:5200
client side: qemu-kvm ...
(qemu) migrate -d tcp:[2312::8274]:5200
Signed-off-by: Amos Kong <akong@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'migration-tcp.c')
-rw-r--r-- | migration-tcp.c | 77 |
1 files changed, 21 insertions, 56 deletions
diff --git a/migration-tcp.c b/migration-tcp.c index 35a5781..440804d 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -79,45 +79,32 @@ static void tcp_wait_for_connect(void *opaque) } } -int tcp_start_outgoing_migration(MigrationState *s, const char *host_port) +int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, + Error **errp) { - struct sockaddr_in addr; - int ret; - - ret = parse_host_port(&addr, host_port); - if (ret < 0) { - return ret; - } - s->get_error = socket_errno; s->write = socket_write; s->close = tcp_close; - s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (s->fd == -1) { - DPRINTF("Unable to open socket"); - return -socket_error(); - } - - socket_set_nonblock(s->fd); - - do { - ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); - if (ret == -1) { - ret = -socket_error(); - } - if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) { - qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); - return 0; - } - } while (ret == -EINTR); + s->fd = inet_connect(host_port, false, errp); - if (ret < 0) { + if (!error_is_set(errp)) { + migrate_fd_connect(s); + } else if (error_is_type(*errp, QERR_SOCKET_CONNECT_IN_PROGRESS)) { + DPRINTF("connect in progress\n"); + qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); + } else if (error_is_type(*errp, QERR_SOCKET_CREATE_FAILED)) { + DPRINTF("connect failed\n"); + return -1; + } else if (error_is_type(*errp, QERR_SOCKET_CONNECT_FAILED)) { DPRINTF("connect failed\n"); migrate_fd_error(s); - return ret; + return -1; + } else { + DPRINTF("unknown error\n"); + return -1; } - migrate_fd_connect(s); + return 0; } @@ -155,40 +142,18 @@ out2: close(s); } -int tcp_start_incoming_migration(const char *host_port) +int tcp_start_incoming_migration(const char *host_port, Error **errp) { - struct sockaddr_in addr; - int val; int s; - DPRINTF("Attempting to start an incoming migration\n"); - - if (parse_host_port(&addr, host_port) < 0) { - fprintf(stderr, "invalid host/port combination: %s\n", host_port); - return -EINVAL; - } - - s = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (s == -1) { - return -socket_error(); - } - - val = 1; - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val)); + s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0, errp); - if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - goto err; - } - if (listen(s, 1) == -1) { - goto err; + if (s < 0) { + return -1; } qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL, (void *)(intptr_t)s); return 0; - -err: - close(s); - return -socket_error(); } |