Commit 6f860ae7 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Amit Shah
Browse files

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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <1461751518-12128-14-git-send-email-berrange@redhat.com>
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent d984464e

migration/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
common-obj-y += migration.o tcp.o unix.o

common-obj-y += migration.o tcp.o socket.o

common-obj-y += vmstate.o

common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o

common-obj-y += qemu-file-channel.o

migration/unix.c→migration/socket.c

+32 −21
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static SocketAddress *unix_build_address(const char *path) 
}





static void unix_outgoing_migration(Object *src,

static void socket_outgoing_migration(Object *src,

                                      Error *err,

                                      gpointer opaque)

{
@@ -46,32 +46,39 @@ static void unix_outgoing_migration(Object *src, 
    QIOChannel *sioc = QIO_CHANNEL(src);



    if (err) {

        trace_migration_unix_outgoing_error(error_get_pretty(err));

        trace_migration_socket_outgoing_error(error_get_pretty(err));

        s->to_dst_file = NULL;

        migrate_fd_error(s, err);

    } else {

        trace_migration_unix_outgoing_connected();

        trace_migration_socket_outgoing_connected();

        migration_set_outgoing_channel(s, sioc);

    }

    object_unref(src);

}





void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp)

static void socket_start_outgoing_migration(MigrationState *s,

                                            SocketAddress *saddr,

                                            Error **errp)

{

    SocketAddress *saddr = unix_build_address(path);

    QIOChannelSocket *sioc;

    sioc = qio_channel_socket_new();

    QIOChannelSocket *sioc = qio_channel_socket_new();

    qio_channel_socket_connect_async(sioc,

                                     saddr,

                                     unix_outgoing_migration,

                                     socket_outgoing_migration,

                                     s,

                                     NULL);

    qapi_free_SocketAddress(saddr);

}



void unix_start_outgoing_migration(MigrationState *s,

                                   const char *path,

                                   Error **errp)

{

    SocketAddress *saddr = unix_build_address(path);

    socket_start_outgoing_migration(s, saddr, errp);

}





static gboolean unix_accept_incoming_migration(QIOChannel *ioc,

static gboolean socket_accept_incoming_migration(QIOChannel *ioc,

                                                 GIOCondition condition,

                                                 gpointer opaque)

{
@@ -86,7 +93,7 @@ static gboolean unix_accept_incoming_migration(QIOChannel *ioc, 
        goto out;

    }



    trace_migration_unix_incoming_accepted();

    trace_migration_socket_incoming_accepted();



    migration_set_incoming_channel(migrate_get_current(),

                                   QIO_CHANNEL(sioc));
@@ -99,12 +106,11 @@ out: 
}





void unix_start_incoming_migration(const char *path, Error **errp)

static void socket_start_incoming_migration(SocketAddress *saddr,

                                            Error **errp)

{

    SocketAddress *saddr = unix_build_address(path);

    QIOChannelSocket *listen_ioc;

    QIOChannelSocket *listen_ioc = qio_channel_socket_new();



    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);
@@ -113,9 +119,14 @@ void unix_start_incoming_migration(const char *path, Error **errp) 


    qio_channel_add_watch(QIO_CHANNEL(listen_ioc),

                          G_IO_IN,

                          unix_accept_incoming_migration,

                          socket_accept_incoming_migration,

                          listen_ioc,

                          (GDestroyNotify)object_unref);



    qapi_free_SocketAddress(saddr);

}



void unix_start_incoming_migration(const char *path, Error **errp)

{

    SocketAddress *saddr = unix_build_address(path);

    socket_start_incoming_migration(saddr, errp);

}

trace-events

+4 −4
Original line number Diff line number Diff line
@@ -1595,10 +1595,10 @@ postcopy_ram_incoming_cleanup_entry(void) "" 
postcopy_ram_incoming_cleanup_exit(void) ""

postcopy_ram_incoming_cleanup_join(void) ""



# migration/unix.c

migration_unix_incoming_accepted(void) ""

migration_unix_outgoing_connected(void) ""

migration_unix_outgoing_error(const char *err) "error=%s"

# migration/socket.c

migration_socket_incoming_accepted(void) ""

migration_socket_outgoing_connected(void) ""

migration_socket_outgoing_error(const char *err) "error=%s"



# kvm-all.c

kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"