qemu-iotests: make cancel_and_wait() common

[qemu.git] / migration-unix.c

diff --git a/migration-unix.c b/migration-unix.c
index 96ea71b787728ec3fedde4dc0ba5cd1c5fb53175..94b7022fc856d3564954120eca9d737155f39eb2 100644 (file)
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -14,11 +14,10 @@
  */
 
 #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/sockets.h"
+#include "migration/migration.h"
+#include "migration/qemu-file.h"
+#include "block/block.h"

 
 //#define DEBUG_MIGRATION_UNIX
 
 
 //#define DEBUG_MIGRATION_UNIX
 


@@ -30,48 +29,24 @@
     do { } while (0)
 #endif
 
     do { } while (0)
 #endif
 

-static int unix_errno(MigrationState *s)
-{
-    return errno;
-}
-
-static int unix_write(MigrationState *s, const void * buf, size_t size)
-{
-    return write(s->fd, buf, size);
-}
-
-static int unix_close(MigrationState *s)
-{
-    int r = 0;
-    DPRINTF("unix_close\n");
-    if (close(s->fd) < 0) {
-        r = -errno;
-    }
-    return r;
-}
-

 static void unix_wait_for_connect(int fd, void *opaque)
 {
     MigrationState *s = opaque;
 
     if (fd < 0) {
         DPRINTF("migrate connect error\n");
 static void unix_wait_for_connect(int fd, void *opaque)
 {
     MigrationState *s = opaque;
 
     if (fd < 0) {
         DPRINTF("migrate connect error\n");

-        s->fd = -1;
+        s->file = NULL;

         migrate_fd_error(s);
     } else {
         DPRINTF("migrate connect success\n");
         migrate_fd_error(s);
     } else {
         DPRINTF("migrate connect success\n");

-        s->fd = fd;
+        s->file = qemu_fopen_socket(fd, "wb");

         migrate_fd_connect(s);
     }
 }
 
 void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp)
 {
         migrate_fd_connect(s);
     }
 }
 
 void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp)
 {

-    s->get_error = unix_errno;
-    s->write = unix_write;
-    s->close = unix_close;
-
-    s->fd = unix_nonblocking_connect(path, unix_wait_for_connect, s, errp);
+    unix_nonblocking_connect(path, unix_wait_for_connect, s, errp);

 }
 
 static void unix_accept_incoming_migration(void *opaque)
 }
 
 static void unix_accept_incoming_migration(void *opaque)


@@ -95,14 +70,13 @@ static void unix_accept_incoming_migration(void *opaque)
         goto out;
     }
 
         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:
     return;
 
 out: