diff options
| author | Peter Maydell | 2015-08-03 18:33:35 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-08-03 18:33:35 +0200 |
| commit | e95edefbd0559e1d0aa09549641b5d9af1f96fac (patch) | |
| tree | 88dcd36e5ae08283a170ee8bf9394932c94a5871 /include | |
| parent | configure: Drop vnc-ws feature from help text (diff) | |
| parent | migration: Fix regression for xenfv and pc,accel=xen machine. (diff) | |
| download | qemu-e95edefbd0559e1d0aa09549641b5d9af1f96fac.tar.gz qemu-e95edefbd0559e1d0aa09549641b5d9af1f96fac.tar.xz qemu-e95edefbd0559e1d0aa09549641b5d9af1f96fac.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into staging
xen-migration-2.4
# gpg: Signature made Mon 03 Aug 2015 17:18:36 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-migration-2.4-tag:
migration: Fix regression for xenfv and pc,accel=xen machine.
migration: Fix global state with Xen.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/migration.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index a2f8ed093c..83346210b1 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -203,4 +203,5 @@ void register_global_state(void); void global_state_set_optional(void); void savevm_skip_configuration(void); int global_state_store(void); +void global_state_store_running(void); #endif |