[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] migration: set name for all I/O channels create
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH 4/6] migration: set name for all I/O channels created |
Date: |
Fri, 30 Sep 2016 16:16:58 +0100 |
Ensure that all I/O channels created for migration are given names
to distinguish their respective roles.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
migration/exec.c | 2 ++
migration/fd.c | 2 ++
migration/migration.c | 1 +
migration/savevm.c | 3 +++
migration/socket.c | 5 +++++
migration/tls.c | 2 ++
6 files changed, 15 insertions(+)
diff --git a/migration/exec.c b/migration/exec.c
index 2af63cc..9157721 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -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,
diff --git a/migration/fd.c b/migration/fd.c
index 84a10fd..58cb51a 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -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,
diff --git a/migration/migration.c b/migration/migration.c
index 955d5ee..e91c89b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1551,6 +1551,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));
diff --git a/migration/savevm.c b/migration/savevm.c
index 33a2911..3f2c089 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -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);
@@ -2068,6 +2069,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);
@@ -2100,6 +2102,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);
diff --git a/migration/socket.c b/migration/socket.c
index 00de1fe..ad3172d 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -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,
@@ -142,6 +143,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));
@@ -158,6 +160,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);
diff --git a/migration/tls.c b/migration/tls.c
index 12c053d..49ca9a8 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -99,6 +99,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,
}
trace_migration_tls_incoming_handshake_start();
+ qio_channel_set_name(QIO_CHANNEL(tioc), "migration-tls-incoming");
qio_channel_tls_handshake(tioc,
migration_tls_incoming_handshake,
NULL,
@@ -154,6 +155,7 @@ void migration_tls_channel_connect(MigrationState *s,
}
trace_migration_tls_outgoing_handshake_start(hostname);
+ qio_channel_set_name(QIO_CHANNEL(tioc), "migration-tls-outgoing");
qio_channel_tls_handshake(tioc,
migration_tls_outgoing_handshake,
s,
--
2.7.4
- [Qemu-devel] [PATCH 0/6] Give names to all GSources QEMU creates, Daniel P. Berrange, 2016/09/30
- [Qemu-devel] [PATCH 2/6] nbd: set name for all I/O channels created, Daniel P. Berrange, 2016/09/30
- [Qemu-devel] [PATCH 1/6] io: add ability to set a name for IO channels, Daniel P. Berrange, 2016/09/30
- [Qemu-devel] [PATCH 3/6] char: set name for all I/O channels created, Daniel P. Berrange, 2016/09/30
- [Qemu-devel] [PATCH 4/6] migration: set name for all I/O channels created,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH 6/6] main: set names for main loop sources created, Daniel P. Berrange, 2016/09/30
- [Qemu-devel] [PATCH 5/6] vnc: set name for all I/O channels created, Daniel P. Berrange, 2016/09/30