Diff for /qemu/migration-tcp.c between versions 1.1.1.3 and 1.1.1.7

version 1.1.1.3, 2018/04/24 17:33:40 version 1.1.1.7, 2018/04/24 19:33:27
Line 9 Line 9
  * This work is licensed under the terms of the GNU GPL, version 2.  See   * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.   * 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-common.h"
 #include "qemu_socket.h"  #include "qemu_socket.h"
 #include "migration.h"  #include "migration.h"
 #include "qemu-char.h"  #include "qemu-char.h"
 #include "sysemu.h"  
 #include "buffered_file.h"  #include "buffered_file.h"
 #include "block.h"  #include "block.h"
   
 //#define DEBUG_MIGRATION_TCP  //#define DEBUG_MIGRATION_TCP
   
 #ifdef DEBUG_MIGRATION_TCP  #ifdef DEBUG_MIGRATION_TCP
 #define dprintf(fmt, ...) \  #define DPRINTF(fmt, ...) \
     do { printf("migration-tcp: " fmt, ## __VA_ARGS__); } while (0)      do { printf("migration-tcp: " fmt, ## __VA_ARGS__); } while (0)
 #else  #else
 #define dprintf(fmt, ...) \  #define DPRINTF(fmt, ...) \
     do { } while (0)      do { } while (0)
 #endif  #endif
   
 static int socket_errno(FdMigrationState *s)  static int socket_errno(MigrationState *s)
 {  {
     return socket_error();      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);      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) {      if (s->fd != -1) {
         close(s->fd);          if (close(s->fd) < 0) {
               r = -errno;
           }
         s->fd = -1;          s->fd = -1;
     }      }
     return 0;      return r;
 }  }
   
   
 static void tcp_wait_for_connect(void *opaque)  static void tcp_wait_for_connect(void *opaque)
 {  {
     FdMigrationState *s = opaque;      MigrationState *s = opaque;
     int val, ret;      int val, ret;
     socklen_t valsize = sizeof(val);      socklen_t valsize = sizeof(val);
   
     dprintf("connect completed\n");      DPRINTF("connect completed\n");
     do {      do {
         ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize);          ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize);
     } while (ret == -1 && (s->get_error(s)) == EINTR);      } while (ret == -1 && (socket_error()) == EINTR);
   
     if (ret < 0) {      if (ret < 0) {
         migrate_fd_error(s);          migrate_fd_error(s);
Line 71  static void tcp_wait_for_connect(void *o Line 74  static void tcp_wait_for_connect(void *o
     if (val == 0)      if (val == 0)
         migrate_fd_connect(s);          migrate_fd_connect(s);
     else {      else {
         dprintf("error connecting %d\n", val);          DPRINTF("error connecting %d\n", val);
         migrate_fd_error(s);          migrate_fd_error(s);
     }      }
 }  }
   
 MigrationState *tcp_start_outgoing_migration(Monitor *mon,  int tcp_start_outgoing_migration(MigrationState *s, const char *host_port,
                                              const char *host_port,                                   Error **errp)
                                              int64_t bandwidth_limit,  
                                              int detach,  
                                              int blk,  
                                              int inc)  
 {  {
     struct sockaddr_in addr;  
     FdMigrationState *s;  
     int ret;  
   
     if (parse_host_port(&addr, host_port) < 0)  
         return NULL;  
   
     s = qemu_mallocz(sizeof(*s));  
   
     s->get_error = socket_errno;      s->get_error = socket_errno;
     s->write = socket_write;      s->write = socket_write;
     s->close = tcp_close;      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->mig_state.blk = blk;  
     s->mig_state.shared = inc;  
   
     s->state = MIG_STATE_ACTIVE;  
     s->mon = NULL;  
     s->bandwidth_limit = bandwidth_limit;  
     s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);  
     if (s->fd == -1) {  
         qemu_free(s);  
         return NULL;  
     }  
   
     socket_set_nonblock(s->fd);      s->fd = inet_connect(host_port, false, errp);
   
     if (!detach) {      if (!error_is_set(errp)) {
         migrate_fd_monitor_suspend(s, mon);  
     }  
   
     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);          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 -1;
       } else {
           DPRINTF("unknown error\n");
           return -1;
       }
   
     return &s->mig_state;      return 0;
 }  }
   
 static void tcp_accept_incoming_migration(void *opaque)  static void tcp_accept_incoming_migration(void *opaque)
 {  {
     struct sockaddr_in addr;      struct sockaddr_in addr;
     socklen_t addrlen = sizeof(addr);      socklen_t addrlen = sizeof(addr);
     int s = (unsigned long)opaque;      int s = (intptr_t)opaque;
     QEMUFile *f;      QEMUFile *f;
     int c, ret;      int c;
   
     do {      do {
         c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);          c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
     } while (c == -1 && socket_error() == EINTR);      } while (c == -1 && socket_error() == EINTR);
   
     dprintf("accepted migration\n");      DPRINTF("accepted migration\n");
   
     if (c == -1) {      if (c == -1) {
         fprintf(stderr, "could not accept migration connection\n");          fprintf(stderr, "could not accept migration connection\n");
         return;          goto out2;
     }      }
   
     f = qemu_fopen_socket(c);      f = qemu_fopen_socket(c);
Line 162  static void tcp_accept_incoming_migratio Line 133  static void tcp_accept_incoming_migratio
         goto out;          goto out;
     }      }
   
     ret = qemu_loadvm_state(f);      process_incoming_migration(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);  
     if (autostart)  
         vm_start();  
   
 out_fopen:  
     qemu_fclose(f);      qemu_fclose(f);
 out:  out:
     close(c);      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;      int s;
   
     if (parse_host_port(&addr, host_port) < 0) {      s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0, errp);
         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));  
   
     if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1)  
         goto err;  
   
     if (listen(s, 1) == -1)      if (s < 0) {
         goto err;          return -1;
       }
   
     qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL,      qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL,
                          (void *)(unsigned long)s);                           (void *)(intptr_t)s);
   
     return 0;      return 0;
   
 err:  
     close(s);  
     return -socket_error();  
 }  }

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.7


unix.superglobalmegacorp.com