diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-02 14:07:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-02 14:07:53 +0100 |
| commit | d47a851caeda96d5979bf48d4bae6a87784ad91d (patch) | |
| tree | 2eba63ddc02a260a3ae0216e416adebd0d1ffa46 /migration/qemu-file-channel.c | |
| parent | 7693cd7cb6229ca034faa88497ddb3a5f27cfb41 (diff) | |
| parent | 2c9e6fec89ff032a3f75a5a1caccc31901fb4056 (diff) | |
| download | focaccia-qemu-d47a851caeda96d5979bf48d4bae6a87784ad91d.tar.gz focaccia-qemu-d47a851caeda96d5979bf48d4bae6a87784ad91d.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170601' into staging
migration/next for 20170601 # gpg: Signature made Thu 01 Jun 2017 17:51:04 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/20170601: migration: Move include/migration/block.h into migration/ migration: Export ram.c functions in its own file migration: Create include for migration snapshots migration: Export rdma.c functions in its own file migration: Export tls.c functions in its own file migration: Export socket.c functions in its own file migration: Export fd.c functions in its own file migration: Export exec.c functions in its own file migration: Split qemu-file.h migration: Remove unneeded includes of migration/vmstate.h migration: shut src return path unconditionally migration: fix leak of src file on dst migration: Remove section_id parameter from vmstate_load migration: loadvm handlers are not used migration: Use savevm_handlers instead of loadvm copy Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/qemu-file-channel.c')
| -rw-r--r-- | migration/qemu-file-channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c index dc991c9051..e202d73834 100644 --- a/migration/qemu-file-channel.c +++ b/migration/qemu-file-channel.c @@ -24,7 +24,8 @@ #include "qemu/osdep.h" #include "qemu-file-channel.h" -#include "migration/qemu-file.h" +#include "exec/cpu-common.h" +#include "qemu-file.h" #include "io/channel-socket.h" #include "qemu/iov.h" |