diff options
| author | Peter Maydell | 2017-06-02 15:07:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-02 15:07:53 +0200 |
| commit | d47a851caeda96d5979bf48d4bae6a87784ad91d (patch) | |
| tree | 2eba63ddc02a260a3ae0216e416adebd0d1ffa46 /include/hw/hw.h | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170602'... (diff) | |
| parent | migration: Move include/migration/block.h into migration/ (diff) | |
| download | qemu-d47a851caeda96d5979bf48d4bae6a87784ad91d.tar.gz qemu-d47a851caeda96d5979bf48d4bae6a87784ad91d.tar.xz 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 'include/hw/hw.h')
| -rw-r--r-- | include/hw/hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/hw.h b/include/hw/hw.h index af9eae11c5..ab4950c312 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -11,7 +11,7 @@ #include "exec/memory.h" #include "hw/irq.h" #include "migration/vmstate.h" -#include "migration/qemu-file.h" +#include "migration/qemu-file-types.h" #include "qemu/module.h" #include "sysemu/reset.h" |