diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-09-13 14:37:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-09-13 14:37:48 +0100 |
| commit | 85182c96de61f0b600bbe834d5a23e713162e892 (patch) | |
| tree | 2ea876bece94357492df2be92be5b2413d7ad7cf /include | |
| parent | 3d9442ee1d78f7f138dcd6c85c7acad0153d2f11 (diff) | |
| parent | 268dcd46ae6d608a4ce93b191b51a318504bf1fb (diff) | |
| download | qemu-85182c96de61f0b600bbe834d5a23e713162e892.zip qemu-85182c96de61f0b600bbe834d5a23e713162e892.tar.gz qemu-85182c96de61f0b600bbe834d5a23e713162e892.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20190912a' into staging
Migration pull 2019-09-12
New feature:
UUID validation check from Yury Kotov
plus a bunch of fixes.
# gpg: Signature made Thu 12 Sep 2019 14:48:28 BST
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20190912a:
migration: fix one typo in comment of function migration_total_bytes()
migration/qemu-file: fix potential buf waste for extra buf_index adjustment
migration/qemu-file: remove check on writev_buffer in qemu_put_compression_data
migration: Fix postcopy bw for recovery
tests/migration: Add a test for validate-uuid capability
tests/libqtest: Allow setting expected exit status
migration: Add validate-uuid capability
qemu-file: Rework old qemu_fflush comment
migration: register_savevm_live doesn't need dev
hw/net/vmxnet3: Fix leftover unregister_savevm
migration: cleanup check on ops in savevm.handlers iterations
migration: multifd_send_thread always post p->sem_sync when error happen
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/register.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/migration/register.h b/include/migration/register.h index 3d0b983..a13359a 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -68,8 +68,7 @@ typedef struct SaveVMHandlers { int (*resume_prepare)(MigrationState *s, void *opaque); } SaveVMHandlers; -int register_savevm_live(DeviceState *dev, - const char *idstr, +int register_savevm_live(const char *idstr, int instance_id, int version_id, const SaveVMHandlers *ops, |