X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=migration-tcp.c;h=a15c2b87a10e2a93bc892d27c0841e744565fec5;hb=7762c2c1e02e44fdc473cbe75105faba08b906cc;hp=100644ba273bccf58d0d1494aaac4c88a887a974;hpb=065e281356282f59386272aa50590b566a1809d9;p=qemu.git diff --git a/migration-tcp.c b/migration-tcp.c index 100644ba2..a15c2b87a 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -9,150 +9,99 @@ * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. */ #include "qemu-common.h" #include "qemu_socket.h" #include "migration.h" #include "qemu-char.h" -#include "sysemu.h" -#include "console.h" #include "buffered_file.h" #include "block.h" //#define DEBUG_MIGRATION_TCP #ifdef DEBUG_MIGRATION_TCP -#define dprintf(fmt, ...) \ +#define DPRINTF(fmt, ...) \ do { printf("migration-tcp: " fmt, ## __VA_ARGS__); } while (0) #else -#define dprintf(fmt, ...) \ +#define DPRINTF(fmt, ...) \ do { } while (0) #endif -static int socket_errno(FdMigrationState *s) +static int socket_errno(MigrationState *s) { - return (s->get_error(s)); + return socket_error(); } -static int socket_write(FdMigrationState *s, const void * buf, size_t size) +static int socket_write(MigrationState *s, const void * buf, size_t size) { return send(s->fd, buf, size, 0); } -static int tcp_close(FdMigrationState *s) +static int tcp_close(MigrationState *s) { - dprintf("tcp_close\n"); + int r = 0; + DPRINTF("tcp_close\n"); if (s->fd != -1) { - close(s->fd); + if (close(s->fd) < 0) { + r = -errno; + } s->fd = -1; } - return 0; + return r; } - -static void tcp_wait_for_connect(void *opaque) +static void tcp_wait_for_connect(int fd, void *opaque) { - FdMigrationState *s = opaque; - int val, ret; - socklen_t valsize = sizeof(val); + MigrationState *s = opaque; - dprintf("connect completed\n"); - do { - ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, &val, &valsize); - } while (ret == -1 && (s->get_error(s)) == EINTR); - - if (ret < 0) { + if (fd < 0) { + DPRINTF("migrate connect error\n"); + s->fd = -1; migrate_fd_error(s); - return; - } - - qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); - - if (val == 0) + } else { + DPRINTF("migrate connect success\n"); + s->fd = fd; migrate_fd_connect(s); - else { - dprintf("error connecting %d\n", val); - migrate_fd_error(s); } } -MigrationState *tcp_start_outgoing_migration(const char *host_port, - int64_t bandwidth_limit, - int async) +int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, + Error **errp) { - struct sockaddr_in addr; - FdMigrationState *s; - int ret; - - if (parse_host_port(&addr, host_port) < 0) - return NULL; - - s = qemu_mallocz(sizeof(*s)); - if (s == NULL) - return NULL; - s->get_error = socket_errno; s->write = socket_write; s->close = tcp_close; - s->mig_state.cancel = migrate_fd_cancel; - s->mig_state.get_status = migrate_fd_get_status; - s->mig_state.release = migrate_fd_release; - - s->state = MIG_STATE_ACTIVE; - s->detach = !async; - s->bandwidth_limit = bandwidth_limit; - s->fd = socket(PF_INET, SOCK_STREAM, 0); - if (s->fd == -1) { - qemu_free(s); - return NULL; - } - socket_set_nonblock(s->fd); - - if (s->detach == 1) { - dprintf("detaching from monitor\n"); - monitor_suspend(); - s->detach = 2; + s->fd = inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, + errp); + if (error_is_set(errp)) { + migrate_fd_error(s); + return -1; } - do { - ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); - if (ret == -1) - ret = -(s->get_error(s)); - - if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) - qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); - } while (ret == -EINTR); - - if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { - dprintf("connect failed\n"); - close(s->fd); - qemu_free(s); - return NULL; - } else if (ret >= 0) - migrate_fd_connect(s); - - return &s->mig_state; + return 0; } static void tcp_accept_incoming_migration(void *opaque) { struct sockaddr_in addr; socklen_t addrlen = sizeof(addr); - int s = (unsigned long)opaque; + int s = (intptr_t)opaque; QEMUFile *f; - int c, ret; + int c; do { - c = accept(s, (struct sockaddr *)&addr, &addrlen); + c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen); } while (c == -1 && socket_error() == EINTR); - dprintf("accepted migration\n"); + DPRINTF("accepted migration\n"); if (c == -1) { fprintf(stderr, "could not accept migration connection\n"); - return; + goto out2; } f = qemu_fopen_socket(c); @@ -161,57 +110,27 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } - vm_stop(0); /* just in case */ - ret = qemu_loadvm_state(f); - if (ret < 0) { - fprintf(stderr, "load of migration failed\n"); - goto out_fopen; - } - qemu_announce_self(); - dprintf("successfully loaded vm state\n"); - - /* we've successfully migrated, close the server socket */ - qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); - close(s); - - vm_start(); - -out_fopen: + process_incoming_migration(f); qemu_fclose(f); out: close(c); +out2: + qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); + 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; - if (parse_host_port(&addr, host_port) < 0) { - fprintf(stderr, "invalid host/port combination: %s\n", host_port); - return -EINVAL; - } - - s = 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 *)(unsigned long)s); + (void *)(intptr_t)s); return 0; - -err: - close(s); - return -socket_error(); }