msf2: Add Smartfusion2 SPI controller

[qemu.git] / migration / fd.c

diff --git a/migration/fd.c b/migration/fd.c
index 3e4bed0e065a7e1cbafbb80dd0358bf5336c26d3..30f5258a6a99b428399b472de480678c349016ae 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -1,10 +1,11 @@
 /*
  * QEMU live migration via generic fd
  *
 /*
  * QEMU live migration via generic fd
  *

- * Copyright Red Hat, Inc. 2009
+ * Copyright Red Hat, Inc. 2009-2016

  *
  * Authors:
  *  Chris Lalancette <[email protected]>
  *
  * Authors:
  *  Chris Lalancette <[email protected]>

+ *  Daniel P. Berrange <[email protected]>

  *
  * 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.


@@ -13,76 +14,62 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
  * GNU GPL, version 2 or (at your option) any later version.
  */
 

-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-#include "qemu/sockets.h"
-#include "migration/migration.h"
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "channel.h"
+#include "fd.h"

 #include "monitor/monitor.h"
 #include "monitor/monitor.h"

-#include "migration/qemu-file.h"
-#include "block/block.h"
+#include "io/channel-util.h"
+#include "trace.h"

 
 

-//#define DEBUG_MIGRATION_FD
-
-#ifdef DEBUG_MIGRATION_FD
-#define DPRINTF(fmt, ...) \
-    do { printf("migration-fd: " fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) \
-    do { } while (0)
-#endif
-
-static bool fd_is_socket(int fd)
-{
-    struct stat stat;
-    int ret = fstat(fd, &stat);
-    if (ret == -1) {
-        /* When in doubt say no */
-        return false;
-    }
-    return S_ISSOCK(stat.st_mode);
-}

 
 void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)
 {
 
 void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)
 {

+    QIOChannel *ioc;

     int fd = monitor_get_fd(cur_mon, fdname, errp);
     if (fd == -1) {
         return;
     }
 
     int fd = monitor_get_fd(cur_mon, fdname, errp);
     if (fd == -1) {
         return;
     }
 

-    if (fd_is_socket(fd)) {
-        s->file = qemu_fopen_socket(fd, "wb");
-    } else {
-        s->file = qemu_fdopen(fd, "wb");
+    trace_migration_fd_outgoing(fd);
+    ioc = qio_channel_new_fd(fd, errp);
+    if (!ioc) {
+        close(fd);
+        return;

     }
 
     }
 

-    migrate_fd_connect(s);
+    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-outgoing");
+    migration_channel_connect(s, ioc, NULL);
+    object_unref(OBJECT(ioc));

 }
 
 }
 

-static void fd_accept_incoming_migration(void *opaque)
+static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
+                                             GIOCondition condition,
+                                             gpointer opaque)

 {
 {

-    QEMUFile *f = opaque;
-
-    qemu_set_fd_handler(qemu_get_fd(f), NULL, NULL, NULL);
-    process_incoming_migration(f);
+    migration_channel_process_incoming(ioc);
+    object_unref(OBJECT(ioc));
+    return FALSE; /* unregister */

 }
 
 void fd_start_incoming_migration(const char *infd, Error **errp)
 {
 }
 
 void fd_start_incoming_migration(const char *infd, Error **errp)
 {

+    QIOChannel *ioc;

     int fd;
     int fd;

-    QEMUFile *f;
-
-    DPRINTF("Attempting to start an incoming migration via fd\n");

 
     fd = strtol(infd, NULL, 0);
 
     fd = strtol(infd, NULL, 0);

-    if (fd_is_socket(fd)) {
-        f = qemu_fopen_socket(fd, "rb");
-    } else {
-        f = qemu_fdopen(fd, "rb");
-    }
-    if(f == NULL) {
-        error_setg_errno(errp, errno, "failed to open the source descriptor");
+    trace_migration_fd_incoming(fd);
+
+    ioc = qio_channel_new_fd(fd, errp);
+    if (!ioc) {
+        close(fd);

         return;
     }
 
         return;
     }
 

-    qemu_set_fd_handler(fd, fd_accept_incoming_migration, NULL, f);
+    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-incoming");
+    qio_channel_add_watch(ioc,
+                          G_IO_IN,
+                          fd_accept_incoming_migration,
+                          NULL,
+                          NULL);

 }
 }