diff options
| author | Peter Maydell | 2018-11-02 10:49:35 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-11-02 10:49:35 +0100 |
| commit | 4cb890b858bd1bd5935457401630d95754c4be48 (patch) | |
| tree | aa93a8e835dcfbb4735f5f88b8d31246cdf36410 /migration/migration.h | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-dt-20181031' into staging (diff) | |
| parent | migration: avoid segmentfault when take a snapshot of a VM which being migrated (diff) | |
| download | qemu-4cb890b858bd1bd5935457401630d95754c4be48.tar.gz qemu-4cb890b858bd1bd5935457401630d95754c4be48.tar.xz qemu-4cb890b858bd1bd5935457401630d95754c4be48.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181031a' into staging
Minor migration fixes 2018-10-31
# gpg: Signature made Wed 31 Oct 2018 16:55:40 GMT
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20181031a:
migration: avoid segmentfault when take a snapshot of a VM which being migrated
qapi: Fix COLOStatus and query-colo-status since version
COLO: Fix Colo doc secondeary should be secondary
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/migration.h')
| -rw-r--r-- | migration/migration.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/migration/migration.h b/migration/migration.h index f7813f8261..e413d4d8b6 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -241,6 +241,8 @@ void migrate_fd_error(MigrationState *s, const Error *error); void migrate_fd_connect(MigrationState *s, Error *error_in); +bool migration_is_setup_or_active(int state); + void migrate_init(MigrationState *s); bool migration_is_blocked(Error **errp); /* True if outgoing migration has entered postcopy phase */ |