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/exec.c | |
| parent | 5deaac15bf4fe1cb21c07680c92e8a8b2e684790 (diff) | |
| parent | 22724f4921e17919dc1b7b796c2c48eadfbcf2da (diff) | |
| download | focaccia-qemu-a66370b08d53837eb233cad090b3c2638084cc44.tar.gz focaccia-qemu-a66370b08d53837eb233cad090b3c2638084cc44.zip | |
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/exec.c')
| -rw-r--r-- | migration/exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/exec.c b/migration/exec.c index 1515cc3319..2af63cced6 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -38,7 +38,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error return; } - migration_set_outgoing_channel(s, ioc, NULL); + migration_channel_connect(s, ioc, NULL); object_unref(OBJECT(ioc)); } @@ -46,7 +46,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc, GIOCondition condition, gpointer opaque) { - migration_set_incoming_channel(migrate_get_current(), ioc); + migration_channel_process_incoming(migrate_get_current(), ioc); object_unref(OBJECT(ioc)); return FALSE; /* unregister */ } |