migration: rename unix.c to socket.c

The unix.c file will be nearly the same as the tcp.c file,
only differing in the initial SocketAddress creation code.
Rename unix.c to socket.c and refactor it a little to
prepare for merging the TCP code.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1461751518-12128-14-git-send-email-berrange@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>

1 files changed, 0 insertions, 121 deletions

diff --git a/migration/unix.c b/migration/unix.c
deleted file mode 100644
index 75205d42ea..0000000000
--- a/migration/unix.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * QEMU live migration via Unix Domain Sockets
- *
- * Copyright Red Hat, Inc. 2009-2016
- *
- * Authors:
- *  Chris Lalancette <clalance@redhat.com>
- *  Daniel P. Berrange <berrange@redhat.com>
- *
- * 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/osdep.h"
-
-#include "qemu-common.h"
-#include "qemu/error-report.h"
-#include "qapi/error.h"
-#include "migration/migration.h"
-#include "migration/qemu-file.h"
-#include "io/channel-socket.h"
-#include "trace.h"
-
-
-static SocketAddress *unix_build_address(const char *path)
-{
-    SocketAddress *saddr;
-
-    saddr = g_new0(SocketAddress, 1);
-    saddr->type = SOCKET_ADDRESS_KIND_UNIX;
-    saddr->u.q_unix.data = g_new0(UnixSocketAddress, 1);
-    saddr->u.q_unix.data->path = g_strdup(path);
-
-    return saddr;
-}
-
-
-static void unix_outgoing_migration(Object *src,
-                                    Error *err,
-                                    gpointer opaque)
-{
-    MigrationState *s = opaque;
-    QIOChannel *sioc = QIO_CHANNEL(src);
-
-    if (err) {
-        trace_migration_unix_outgoing_error(error_get_pretty(err));
-        s->to_dst_file = NULL;
-        migrate_fd_error(s, err);
-    } else {
-        trace_migration_unix_outgoing_connected();
-        migration_set_outgoing_channel(s, sioc);
-    }
-    object_unref(src);
-}
-
-
-void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp)
-{
-    SocketAddress *saddr = unix_build_address(path);
-    QIOChannelSocket *sioc;
-    sioc = qio_channel_socket_new();
-    qio_channel_socket_connect_async(sioc,
-                                     saddr,
-                                     unix_outgoing_migration,
-                                     s,
-                                     NULL);
-    qapi_free_SocketAddress(saddr);
-}
-
-
-static gboolean unix_accept_incoming_migration(QIOChannel *ioc,
-                                               GIOCondition condition,
-                                               gpointer opaque)
-{
-    QIOChannelSocket *sioc;
-    Error *err = NULL;
-
-    sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
-                                     &err);
-    if (!sioc) {
-        error_report("could not accept migration connection (%s)",
-                     error_get_pretty(err));
-        goto out;
-    }
-
-    trace_migration_unix_incoming_accepted();
-
-    migration_set_incoming_channel(migrate_get_current(),
-                                   QIO_CHANNEL(sioc));
-    object_unref(OBJECT(sioc));
-
-out:
-    /* Close listening socket as its no longer needed */
-    qio_channel_close(ioc, NULL);
-    return FALSE; /* unregister */
-}
-
-
-void unix_start_incoming_migration(const char *path, Error **errp)
-{
-    SocketAddress *saddr = unix_build_address(path);
-    QIOChannelSocket *listen_ioc;
-
-    listen_ioc = qio_channel_socket_new();
-    if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
-        object_unref(OBJECT(listen_ioc));
-        qapi_free_SocketAddress(saddr);
-        return;
-    }
-
-    qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
-                          G_IO_IN,
-                          unix_accept_incoming_migration,
-                          listen_ioc,
-                          (GDestroyNotify)object_unref);
-
-    qapi_free_SocketAddress(saddr);
-}