aboutsummaryrefslogtreecommitdiff
path: root/include/sysemu
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-21 13:22:43 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-21 13:22:43 -0600
commit016c7182315b1f842ac351fae86041d2c8fe4596 (patch)
treeffbf5a20726ed68d5beaba6b19627acdf778492c /include/sysemu
parente0f01837e104517c7c511c79bb93c8792b7263e5 (diff)
parent6522773f88a2e37800f0bf7dc3632a14649f53c6 (diff)
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/sysemu')
-rw-r--r--include/sysemu/sysemu.h2
1 files changed, 1 insertions, 1 deletions
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);