hw/block/pflash_cfi01: Report correct size info for parallel configs

[qemu.git] / migration-tcp.c

diff --git a/migration-tcp.c b/migration-tcp.c
index 35a57818238b1ea5290bf04a8a494245722cface..2e34517bb905961818a5e189c7faef1e88e7159b 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -13,12 +13,15 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
  * GNU GPL, version 2 or (at your option) any later version.
  */
 

+#include <string.h>
+

 #include "qemu-common.h"
 #include "qemu-common.h"

-#include "qemu_socket.h"
-#include "migration.h"
-#include "qemu-char.h"
-#include "buffered_file.h"
-#include "block.h"
+#include "qemu/error-report.h"
+#include "qemu/sockets.h"
+#include "migration/migration.h"
+#include "migration/qemu-file.h"
+#include "block/block.h"
+#include "qemu/main-loop.h"

 
 //#define DEBUG_MIGRATION_TCP
 
 
 //#define DEBUG_MIGRATION_TCP
 


@@ -30,95 +33,24 @@
     do { } while (0)
 #endif
 
     do { } while (0)
 #endif
 

-static int socket_errno(MigrationState *s)
-{
-    return socket_error();
-}
-
-static int socket_write(MigrationState *s, const void * buf, size_t size)
-{
-    return send(s->fd, buf, size, 0);
-}
-
-static int tcp_close(MigrationState *s)
-{
-    int r = 0;
-    DPRINTF("tcp_close\n");
-    if (s->fd != -1) {
-        if (close(s->fd) < 0) {
-            r = -errno;
-        }
-        s->fd = -1;
-    }
-    return r;
-}
-
-static void tcp_wait_for_connect(void *opaque)
+static void tcp_wait_for_connect(int fd, void *opaque)

 {
     MigrationState *s = opaque;
 {
     MigrationState *s = opaque;

-    int val, ret;
-    socklen_t valsize = sizeof(val);

 
 

-    DPRINTF("connect completed\n");
-    do {
-        ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize);
-    } while (ret == -1 && (socket_error()) == 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);

     }
 }
 
     }
 }
 

-int tcp_start_outgoing_migration(MigrationState *s, const char *host_port)
+void 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);
-
-    if (ret < 0) {
-        DPRINTF("connect failed\n");
-        migrate_fd_error(s);
-        return ret;
-    }
-    migrate_fd_connect(s);
-    return 0;
+    inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, errp);

 }
 
 static void tcp_accept_incoming_migration(void *opaque)
 }
 
 static void tcp_accept_incoming_migration(void *opaque)


@@ -127,68 +59,45 @@ static void tcp_accept_incoming_migration(void *opaque)
     socklen_t addrlen = sizeof(addr);
     int s = (intptr_t)opaque;
     QEMUFile *f;
     socklen_t addrlen = sizeof(addr);
     int s = (intptr_t)opaque;
     QEMUFile *f;

-    int c;
+    int c, err;

 
     do {
         c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
 
     do {
         c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);

-    } while (c == -1 && socket_error() == EINTR);
+        err = socket_error();
+    } while (c < 0 && err == EINTR);
+    qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
+    closesocket(s);

 
     DPRINTF("accepted migration\n");
 
 
     DPRINTF("accepted migration\n");
 

-    if (c == -1) {
-        fprintf(stderr, "could not accept migration connection\n");
-        goto out2;
+    if (c < 0) {
+        error_report("could not accept migration connection (%s)",
+                     strerror(err));
+        return;

     }
 
     }
 

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

     if (f == NULL) {
     if (f == NULL) {

-        fprintf(stderr, "could not qemu_fopen socket\n");
+        error_report("could not qemu_fopen socket");

         goto out;
     }
 
     process_incoming_migration(f);
         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;
 

-    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));
-
-    if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
-        goto err;
-    }
-    if (listen(s, 1) == -1) {
-        goto err;
+    s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0, errp);
+    if (s < 0) {
+        return;

     }
 
     qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL,
                          (void *)(intptr_t)s);
     }
 
     qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL,
                          (void *)(intptr_t)s);

-
-    return 0;
-
-err:
-    close(s);
-    return -socket_error();

 }
 }