diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-15 09:43:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-15 09:43:12 +0100 |
| commit | 73aa4692ec00d479dd1732b40c068d78d3eb909c (patch) | |
| tree | 9ea2eba4884ffed2d138812221bbf35d5badd58e /migration/colo.c | |
| parent | 3f0602927b120a480b35dcf58cf6f95435b3ae91 (diff) | |
| parent | 3416ab5bb452f1b6cea58aed8983ffb9a455b7c4 (diff) | |
| download | focaccia-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 'migration/colo.c')
| -rw-r--r-- | migration/colo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/migration/colo.c b/migration/colo.c index 45e9b46289..c436d63a19 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu-file-channel.h" #include "migration.h" @@ -22,7 +21,6 @@ #include "io/channel-buffer.h" #include "trace.h" #include "qemu/error-report.h" -#include "qapi/error.h" #include "migration/failover.h" #include "replication.h" #include "qmp-commands.h" |