Commit 6f01f136 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

migration: set name for all I/O channels created 



Ensure that all I/O channels created for migration are given names
to distinguish their respective roles.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent e93a68e1

migration/exec.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error 
        return;

    }



    qio_channel_set_name(ioc, "migration-exec-outgoing");

    migration_channel_connect(s, ioc, NULL);

    object_unref(OBJECT(ioc));

}
@@ -64,6 +65,7 @@ void exec_start_incoming_migration(const char *command, Error **errp) 
        return;

    }



    qio_channel_set_name(ioc, "migration-exec-incoming");

    qio_channel_add_watch(ioc,

                          G_IO_IN,

                          exec_accept_incoming_migration,

migration/fd.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error ** 
        return;

    }



    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-outgoing");

    migration_channel_connect(s, ioc, NULL);

    object_unref(OBJECT(ioc));

}
@@ -65,6 +66,7 @@ void fd_start_incoming_migration(const char *infd, Error **errp) 
        return;

    }



    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-incoming");

    qio_channel_add_watch(ioc,

                          G_IO_IN,

                          fd_accept_incoming_migration,

migration/migration.c

+1 −0
Original line number Diff line number Diff line
@@ -1567,6 +1567,7 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running) 
     * to do this we use a qemu_buf to hold the whole of the device state.

     */

    bioc = qio_channel_buffer_new(4096);

    qio_channel_set_name(QIO_CHANNEL(bioc), "migration-postcopy-buffer");

    fb = qemu_fopen_channel_output(QIO_CHANNEL(bioc));

    object_unref(OBJECT(bioc));

migration/savevm.c

+3 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,7 @@ static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis) 
    }



    bioc = qio_channel_buffer_new(length);

    qio_channel_set_name(QIO_CHANNEL(bioc), "migration-loadvm-buffer");

    ret = qemu_get_buffer(mis->from_src_file,

                          bioc->data,

                          length);
@@ -2073,6 +2074,7 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp) 
    if (!ioc) {

        goto the_end;

    }

    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-save-state");

    f = qemu_fopen_channel_output(QIO_CHANNEL(ioc));

    ret = qemu_save_device_state(f);

    qemu_fclose(f);
@@ -2105,6 +2107,7 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp) 
    if (!ioc) {

        return;

    }

    qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-load-state");

    f = qemu_fopen_channel_input(QIO_CHANNEL(ioc));



    migration_incoming_state_new(f);

migration/socket.c

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static void socket_start_outgoing_migration(MigrationState *s, 
        data->hostname = g_strdup(saddr->u.inet.data->host);

    }



    qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-outgoing");

    qio_channel_socket_connect_async(sioc,

                                     saddr,

                                     socket_outgoing_migration,
@@ -146,6 +147,7 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc, 


    trace_migration_socket_incoming_accepted();



    qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");

    migration_channel_process_incoming(migrate_get_current(),

                                       QIO_CHANNEL(sioc));

    object_unref(OBJECT(sioc));
@@ -162,6 +164,9 @@ static void socket_start_incoming_migration(SocketAddress *saddr, 
{

    QIOChannelSocket *listen_ioc = qio_channel_socket_new();



    qio_channel_set_name(QIO_CHANNEL(listen_ioc),

                         "migration-socket-listener");



    if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {

        object_unref(OBJECT(listen_ioc));

        qapi_free_SocketAddress(saddr);