diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-06 10:51:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-06 10:51:19 +0100 |
| commit | 8be2094648f85acbd443ea0b5710e5988fda6741 (patch) | |
| tree | 8b1c1b98b65a755b8a802eb1fc1278100e196975 /migration/fd.h | |
| parent | 47fbad45d47af8af784bb12a5719489edcd89b4c (diff) | |
| parent | 03158519384f15890d587937bd1b3ea699898e55 (diff) | |
| download | focaccia-qemu-8be2094648f85acbd443ea0b5710e5988fda6741.tar.gz focaccia-qemu-8be2094648f85acbd443ea0b5710e5988fda6741.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration-pull-request' into staging
Migration Pull request # gpg: Signature made Wed 05 Jun 2019 12:52:06 BST # gpg: using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723 # gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full] # gpg: aka "Juan Quintela <quintela@trasno.org>" [full] # Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723 * remotes/juanquintela/tags/migration-pull-request: migratioin/ram: leave RAMBlock->bmap blank on allocating migration-test: Add a test for fd protocol migration: Fix fd protocol for incoming defer migration/ram.c: multifd_send_state->count is not really used migration/ram.c: MultiFDSendParams.sem_sync is not really used Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/fd.h')
| -rw-r--r-- | migration/fd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/fd.h b/migration/fd.h index a14a63ce2e..b901bc014e 100644 --- a/migration/fd.h +++ b/migration/fd.h @@ -16,7 +16,7 @@ #ifndef QEMU_MIGRATION_FD_H #define QEMU_MIGRATION_FD_H -void fd_start_incoming_migration(const char *path, Error **errp); +void fd_start_incoming_migration(const char *fdname, Error **errp); void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp); |