OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: set name for all I/O channels created

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

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-09-30 11:57:14 +01:00
parent e93a68e102
commit 6f01f136af
6 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/exec.c
View File

@ -38,6 +38,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error
return; return;
} }
qio_channel_set_name(ioc, "migration-exec-outgoing");
migration_channel_connect(s, ioc, NULL); migration_channel_connect(s, ioc, NULL);
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
} }
@ -64,6 +65,7 @@ void exec_start_incoming_migration(const char *command, Error **errp)
return; return;
} }
qio_channel_set_name(ioc, "migration-exec-incoming");
qio_channel_add_watch(ioc, qio_channel_add_watch(ioc,
G_IO_IN, G_IO_IN,
exec_accept_incoming_migration, exec_accept_incoming_migration,

2
migration/fd.c
View File

@ -38,6 +38,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **
return; return;
} }
qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-outgoing");
migration_channel_connect(s, ioc, NULL); migration_channel_connect(s, ioc, NULL);
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
} }
@ -65,6 +66,7 @@ void fd_start_incoming_migration(const char *infd, Error **errp)
return; return;
} }
qio_channel_set_name(QIO_CHANNEL(ioc), "migration-fd-incoming");
qio_channel_add_watch(ioc, qio_channel_add_watch(ioc,
G_IO_IN, G_IO_IN,
fd_accept_incoming_migration, fd_accept_incoming_migration,

1
migration/migration.c
View File

@ -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. * to do this we use a qemu_buf to hold the whole of the device state.
*/ */
bioc = qio_channel_buffer_new(4096); bioc = qio_channel_buffer_new(4096);
qio_channel_set_name(QIO_CHANNEL(bioc), "migration-postcopy-buffer");
fb = qemu_fopen_channel_output(QIO_CHANNEL(bioc)); fb = qemu_fopen_channel_output(QIO_CHANNEL(bioc));
object_unref(OBJECT(bioc)); object_unref(OBJECT(bioc));

3
migration/savevm.c
View File

@ -1582,6 +1582,7 @@ static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis)
} }
bioc = qio_channel_buffer_new(length); bioc = qio_channel_buffer_new(length);
qio_channel_set_name(QIO_CHANNEL(bioc), "migration-loadvm-buffer");
ret = qemu_get_buffer(mis->from_src_file, ret = qemu_get_buffer(mis->from_src_file,
bioc->data, bioc->data,
length); length);
@ -2073,6 +2074,7 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp)
if (!ioc) { if (!ioc) {
goto the_end; goto the_end;
} }
qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-save-state");
f = qemu_fopen_channel_output(QIO_CHANNEL(ioc)); f = qemu_fopen_channel_output(QIO_CHANNEL(ioc));
ret = qemu_save_device_state(f); ret = qemu_save_device_state(f);
qemu_fclose(f); qemu_fclose(f);
@ -2105,6 +2107,7 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp)
if (!ioc) { if (!ioc) {
return; return;
} }
qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-load-state");
f = qemu_fopen_channel_input(QIO_CHANNEL(ioc)); f = qemu_fopen_channel_input(QIO_CHANNEL(ioc));
migration_incoming_state_new(f); migration_incoming_state_new(f);

5
migration/socket.c
View File

@ -100,6 +100,7 @@ static void socket_start_outgoing_migration(MigrationState *s,
data->hostname = g_strdup(saddr->u.inet.data->host); 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, qio_channel_socket_connect_async(sioc,
saddr, saddr,
socket_outgoing_migration, socket_outgoing_migration,
@ -146,6 +147,7 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
trace_migration_socket_incoming_accepted(); trace_migration_socket_incoming_accepted();
qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");
migration_channel_process_incoming(migrate_get_current(), migration_channel_process_incoming(migrate_get_current(),
QIO_CHANNEL(sioc)); QIO_CHANNEL(sioc));
object_unref(OBJECT(sioc)); object_unref(OBJECT(sioc));
@ -162,6 +164,9 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
{ {
QIOChannelSocket *listen_ioc = qio_channel_socket_new(); 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) { if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
object_unref(OBJECT(listen_ioc)); object_unref(OBJECT(listen_ioc));
qapi_free_SocketAddress(saddr); qapi_free_SocketAddress(saddr);

2
migration/tls.c
View File

@ -99,6 +99,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,
} }
trace_migration_tls_incoming_handshake_start(); trace_migration_tls_incoming_handshake_start();
qio_channel_set_name(QIO_CHANNEL(tioc), "migration-tls-incoming");
qio_channel_tls_handshake(tioc, qio_channel_tls_handshake(tioc,
migration_tls_incoming_handshake, migration_tls_incoming_handshake,
NULL, NULL,
@ -154,6 +155,7 @@ void migration_tls_channel_connect(MigrationState *s,
} }
trace_migration_tls_outgoing_handshake_start(hostname); trace_migration_tls_outgoing_handshake_start(hostname);
qio_channel_set_name(QIO_CHANNEL(tioc), "migration-tls-outgoing");
qio_channel_tls_handshake(tioc, qio_channel_tls_handshake(tioc,
migration_tls_outgoing_handshake, migration_tls_outgoing_handshake,
s, s,