diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-16 10:53:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-16 10:53:33 +0100 |
| commit | a66370b08d53837eb233cad090b3c2638084cc44 (patch) | |
| tree | 0fe05c6bebb4fac381ea6d42fa2d0569c8241204 /migration/socket.c | |
| parent | 5deaac15bf4fe1cb21c07680c92e8a8b2e684790 (diff) | |
| parent | 22724f4921e17919dc1b7b796c2c48eadfbcf2da (diff) | |
| download | qemu-a66370b08d53837eb233cad090b3c2638084cc44.zip qemu-a66370b08d53837eb233cad090b3c2638084cc44.tar.gz qemu-a66370b08d53837eb233cad090b3c2638084cc44.tar.bz2 | |
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.7-4' into staging
Migration:
- Fixes for TLS series
- Postcopy: Add stats, fix, test case
# gpg: Signature made Thu 16 Jun 2016 05:40:09 BST
# gpg: using RSA key 0xEB0B4DFC657EF670
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
# Primary key fingerprint: 48CA 3722 5FE7 F4A8 B337 2735 1E9A 3B5F 8540 83B6
# Subkey fingerprint: CC63 D332 AB8F 4617 4529 6534 EB0B 4DFC 657E F670
* remotes/amit-migration/tags/migration-for-2.7-4:
migration: rename functions to starting migrations
migration: fix typos in qapi-schema from latest migration additions
Postcopy: Check for support when setting the capability
tests: fix libqtest socket timeouts
test: Postcopy
Postcopy: Add stats on page requests
Migration: Split out ram part of qmp_query_migrate
Postcopy: Avoid 0 length discards
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/socket.c')
| -rw-r--r-- | migration/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/migration/socket.c b/migration/socket.c index 977a8d3..5c0a38f 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -83,7 +83,7 @@ static void socket_outgoing_migration(Object *src, migrate_fd_error(data->s, err); } else { trace_migration_socket_outgoing_connected(data->hostname); - migration_set_outgoing_channel(data->s, sioc, data->hostname); + migration_channel_connect(data->s, sioc, data->hostname); } object_unref(src); } @@ -140,8 +140,8 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc, trace_migration_socket_incoming_accepted(); - migration_set_incoming_channel(migrate_get_current(), - QIO_CHANNEL(sioc)); + migration_channel_process_incoming(migrate_get_current(), + QIO_CHANNEL(sioc)); object_unref(OBJECT(sioc)); out: |