X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=migration-exec.c;h=479024752f54ff4217dc2ccde4dfa3668cabb81b;hb=da87dd7bd70f71ceaf9ff40d7cdb8394a7dc4bf5;hp=2cfb6f232c092df965b9dc789665c3d1fb6206d6;hpb=7267c0947d7e8ae5dff7bafd932c3bc285f43e5c;p=qemu.git

diff --git a/migration-exec.c b/migration-exec.c
index 2cfb6f232..479024752 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -11,14 +11,16 @@
  * 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 "buffered_file.h"
-#include "block.h"
+#include "qemu/sockets.h"
+#include "qemu/main-loop.h"
+#include "migration/migration.h"
+#include "migration/qemu-file.h"
+#include "block/block.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -32,113 +34,36 @@
     do { } while (0)
 #endif
 
-static int file_errno(FdMigrationState *s)
+void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
 {
-    return errno;
-}
-
-static int file_write(FdMigrationState *s, const void * buf, size_t size)
-{
-    return write(s->fd, buf, size);
-}
-
-static int exec_close(FdMigrationState *s)
-{
-    int ret = 0;
-    DPRINTF("exec_close\n");
-    if (s->opaque) {
-        ret = qemu_fclose(s->opaque);
-        s->opaque = NULL;
-        s->fd = -1;
-        if (ret != -1 &&
-            WIFEXITED(ret)
-            && WEXITSTATUS(ret) == 0) {
-            ret = 0;
-        } else {
-            ret = -1;
-        }
-    }
-    return ret;
-}
-
-MigrationState *exec_start_outgoing_migration(Monitor *mon,
-                                              const char *command,
-					      int64_t bandwidth_limit,
-					      int detach,
-					      int blk,
-					      int inc)
-{
-    FdMigrationState *s;
-    FILE *f;
-
-    s = g_malloc0(sizeof(*s));
-
-    f = popen(command, "w");
-    if (f == NULL) {
-        DPRINTF("Unable to popen exec target\n");
-        goto err_after_alloc;
-    }
-
-    s->fd = fileno(f);
-    if (s->fd == -1) {
-        DPRINTF("Unable to retrieve file descriptor for popen'd handle\n");
-        goto err_after_open;
-    }
-
-    socket_set_nonblock(s->fd);
-
-    s->opaque = qemu_popen(f, "w");
-
-    s->close = exec_close;
-    s->get_error = file_errno;
-    s->write = file_write;
-    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;
-
-    if (!detach) {
-        migrate_fd_monitor_suspend(s, mon);
+    s->file = qemu_popen_cmd(command, "w");
+    if (s->file == NULL) {
+        error_setg_errno(errp, errno, "failed to popen the migration target");
+        return;
     }
 
     migrate_fd_connect(s);
-    return &s->mig_state;
-
-err_after_open:
-    pclose(f);
-err_after_alloc:
-    g_free(s);
-    return NULL;
 }
 
 static void exec_accept_incoming_migration(void *opaque)
 {
     QEMUFile *f = opaque;
 
+    qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
     process_incoming_migration(f);
-    qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
-    qemu_fclose(f);
 }
 
-int exec_start_incoming_migration(const char *command)
+void exec_start_incoming_migration(const char *command, Error **errp)
 {
     QEMUFile *f;
 
     DPRINTF("Attempting to start an incoming migration\n");
     f = qemu_popen_cmd(command, "r");
     if(f == NULL) {
-        DPRINTF("Unable to apply qemu wrapper to popen file\n");
-        return -errno;
+        error_setg_errno(errp, errno, "failed to popen the migration source");
+        return;
     }
 
-    qemu_set_fd_handler2(qemu_stdio_fd(f), NULL,
+    qemu_set_fd_handler2(qemu_get_fd(f), NULL,
 			 exec_accept_incoming_migration, NULL, f);
-
-    return 0;
 }