summary refs log tree commit diff stats
path: root/include/qemu/typedefs.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-06-15 09:43:12 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-06-15 09:43:12 +0100
commit73aa4692ec00d479dd1732b40c068d78d3eb909c (patch)
tree9ea2eba4884ffed2d138812221bbf35d5badd58e /include/qemu/typedefs.h
parent3f0602927b120a480b35dcf58cf6f95435b3ae91 (diff)
parent3416ab5bb452f1b6cea58aed8983ffb9a455b7c4 (diff)
downloadfocaccia-qemu-73aa4692ec00d479dd1732b40c068d78d3eb909c.tar.gz
focaccia-qemu-73aa4692ec00d479dd1732b40c068d78d3eb909c.zip
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170614' into staging
migration/next for 20170614

# gpg: Signature made Wed 14 Jun 2017 11:16:21 BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170614:
  migration: Don't create decompression threads if not enabled
  migration: Test for disabled features on reception
  migration: Remove unneeded includes
  migration: fix incorrect enable return path
  migration: Fix compilation with older compilers

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/typedefs.h')
-rw-r--r--include/qemu/typedefs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 51958bf7d3..f745d5faf7 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -96,5 +96,7 @@ typedef struct uWireSlave uWireSlave;
 typedef struct VirtIODevice VirtIODevice;
 typedef struct Visitor Visitor;
 typedef struct node_info NodeInfo;
+typedef void SaveStateHandler(QEMUFile *f, void *opaque);
+typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
 
 #endif /* QEMU_TYPEDEFS_H */