diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-21 13:22:43 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-21 13:22:43 -0600 |
| commit | 016c7182315b1f842ac351fae86041d2c8fe4596 (patch) | |
| tree | ffbf5a20726ed68d5beaba6b19627acdf778492c /include | |
| parent | e0f01837e104517c7c511c79bb93c8792b7263e5 (diff) | |
| parent | 6522773f88a2e37800f0bf7dc3632a14649f53c6 (diff) | |
| download | qemu-016c7182315b1f842ac351fae86041d2c8fe4596.tar.gz | |
Merge remote-tracking branch 'quintela/thread.next' into staging
# By Juan Quintela (7) and Paolo Bonzini (6)
# Via Juan Quintela
* quintela/thread.next:
migration: remove argument to qemu_savevm_state_cancel
migration: Only go to the iterate stage if there is anything to send
migration: unfold rest of migrate_fd_put_ready() into thread
migration: move exit condition to migration thread
migration: Add buffered_flush error handling
migration: move beginning stage to the migration thread
qemu-file: Only set last_error if it is not already set
migration: fix off-by-one in buffered_rate_limit
migration: remove double call to migrate_fd_close
migration: make function static
use XFER_LIMIT_RATIO consistently
Protect migration_bitmap_sync() with the ramlist lock
Unlock ramlist lock also in error case
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/migration.h | 3 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index 2d5b630cce..a8c9639732 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -54,7 +54,6 @@ struct MigrationState bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; bool complete; - bool first_time; }; void process_incoming_migration(QEMUFile *f); @@ -87,8 +86,6 @@ void migrate_fd_error(MigrationState *s); void migrate_fd_connect(MigrationState *s); -ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, - size_t size); int migrate_fd_close(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 6599617def..337ce7df0c 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -77,7 +77,7 @@ int qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params); int qemu_savevm_state_iterate(QEMUFile *f); int qemu_savevm_state_complete(QEMUFile *f); -void qemu_savevm_state_cancel(QEMUFile *f); +void qemu_savevm_state_cancel(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); int qemu_loadvm_state(QEMUFile *f); |