qemu-io: Make cvtnum() a wrapper around strtosz_suffix()

[qemu.git] / migration-tcp.c

diff --git a/migration-tcp.c b/migration-tcp.c
index b55f419b654f51de8309db59c43020194f632460..b20ee58f558cb21758478cfac4baca68dee14615 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -9,15 +9,15 @@
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
  *
  * 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-common.h"

-#include "qemu_socket.h"
-#include "migration.h"
-#include "qemu-char.h"
-#include "sysemu.h"
-#include "buffered_file.h"
-#include "block.h"
+#include "qemu/sockets.h"
+#include "migration/migration.h"
+#include "migration/qemu-file.h"
+#include "block/block.h"

 
 //#define DEBUG_MIGRATION_TCP
 
 
 //#define DEBUG_MIGRATION_TCP
 


@@ -29,176 +29,69 @@
     do { } while (0)
 #endif
 
     do { } while (0)
 #endif
 

-static int socket_errno(FdMigrationState *s)
+static void tcp_wait_for_connect(int fd, void *opaque)

 {
 {

-    return socket_error();
-}
-
-static int socket_write(FdMigrationState *s, const void * buf, size_t size)
-{
-    return send(s->fd, buf, size, 0);
-}
-
-static int tcp_close(FdMigrationState *s)
-{
-    DPRINTF("tcp_close\n");
-    if (s->fd != -1) {
-        close(s->fd);
-        s->fd = -1;
-    }
-    return 0;
-}
-
-
-static void tcp_wait_for_connect(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, (void *) &val, &valsize);
-    } while (ret == -1 && (s->get_error(s)) == EINTR);
-
-    if (ret < 0) {
+    if (fd < 0) {
+        DPRINTF("migrate connect error\n");
+        s->file = NULL;

         migrate_fd_error(s);
         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->file = qemu_fopen_socket(fd, "wb");

         migrate_fd_connect(s);
         migrate_fd_connect(s);

-    else {
-        DPRINTF("error connecting %d\n", val);
-        migrate_fd_error(s);

     }
 }
 
     }
 }
 

-MigrationState *tcp_start_outgoing_migration(Monitor *mon,
-                                             const char *host_port,
-                                             int64_t bandwidth_limit,
-                                             int detach,
-                                            int blk,
-                                            int inc)
+void 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));
-
-    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->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);
-
-    if (!detach) {
-        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");
-        migrate_fd_error(s);
-    } else if (ret >= 0)
-        migrate_fd_connect(s);
-
-    return &s->mig_state;
+    inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, errp);

 }
 
 static void tcp_accept_incoming_migration(void *opaque)
 {
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof(addr);
 }
 
 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;
 
     do {
         c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
     } while (c == -1 && socket_error() == EINTR);
     QEMUFile *f;
     int c;
 
     do {
         c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
     } while (c == -1 && socket_error() == EINTR);

+    qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
+    closesocket(s);

 
     DPRINTF("accepted migration\n");
 
     if (c == -1) {
         fprintf(stderr, "could not accept migration connection\n");
 
     DPRINTF("accepted migration\n");
 
     if (c == -1) {
         fprintf(stderr, "could not accept migration connection\n");

-        goto out2;
+        goto out;

     }
 
     }
 

-    f = qemu_fopen_socket(c);
+    f = qemu_fopen_socket(c, "rb");

     if (f == NULL) {
         fprintf(stderr, "could not qemu_fopen socket\n");
         goto out;
     }
 
     process_incoming_migration(f);
     if (f == NULL) {
         fprintf(stderr, "could not qemu_fopen socket\n");
         goto out;
     }
 
     process_incoming_migration(f);

-    qemu_fclose(f);
+    return;
+

 out:
 out:

-    close(c);
-out2:
-    qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
-    close(s);
+    closesocket(c);

 }
 
 }
 

-int tcp_start_incoming_migration(const char *host_port)
+void 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) {
-        fprintf(stderr, "invalid host/port combination: %s\n", host_port);
-        return -EINVAL;
+    s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0, errp);
+    if (s < 0) {
+        return;

     }
 
     }
 

-    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)
-        goto err;
-

     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);
-
-    return 0;
-
-err:
-    close(s);
-    return -socket_error();
+                         (void *)(intptr_t)s);

 }
 }