diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-19 16:36:51 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-19 16:43:46 +0100 |
| commit | 14c1f7deb43ec0e1a7f2eabfe652bfad1124392d (patch) | |
| tree | ce122bd7827f2bcc9120e28fb1bf63b498f18fd4 /block | |
| parent | 56821559f0ba682fe6b367815572e6f974d329ab (diff) | |
| parent | 46d702b106d20beda2fcd0f96ddc44855ba262b3 (diff) | |
Merge remote-tracking branch 'quintela/tags/migration/20170518' into staging
migration/next for 20170518
# gpg: Signature made Thu 18 May 2017 06:23:26 PM 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
* quintela/tags/migration/20170518:
migration: Make savevm.c target independent
exec: Create include for target_page_size()
migration: migration.h was not needed
migration: Remove vmstate.h from migration.h
migration: Remove qemu-file.h from vmstate.h
migration: Split vmstate-types.c from vmstate.c
migration: Move qjson.h to migration/
migration: Remove migration.h from colo.h
migration: Export qemu-file-channel.c functions in its own file
migration: Split migration/channel.c for channel operations
migration: Create migration/xbzrle.h
block migration: Allow compile time disable
migration: Remove old MigrationParams
migration: Remove use of old MigrationParams
migration: Create block capability
hmp: Use visitor api for hmp_migrate_set_parameter()
postcopy: Require RAMBlocks that are whole pages
migration: Fix non-multiple of page size migration
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qed.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/block/qed.c b/block/qed.c index fd76817cbb..8d899fd479 100644 --- a/block/qed.c +++ b/block/qed.c @@ -19,7 +19,6 @@ #include "trace.h" #include "qed.h" #include "qapi/qmp/qerror.h" -#include "migration/migration.h" #include "sysemu/block-backend.h" static const AIOCBInfo qed_aiocb_info = { |