diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-24 12:21:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-24 12:21:07 +0100 |
| commit | 99694362ee563c5bbfad92bcc6bd578c0d4f7ce7 (patch) | |
| tree | bf6e256235405492bab498e558fe34118abba429 /migration/Makefile.objs | |
| parent | b0f6ef8915247f3230ffd9b71af9c3dadb6082c7 (diff) | |
| parent | fe904ea8242cbae2d7e69c052c754b8f5f1ba1d6 (diff) | |
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-2.7-1' into staging
migration fixes:
- ensure src block devices continue fine after a failed migration
- fail on migration blockers; helps 9p savevm/loadvm
- move autoconverge commands out of experimental state
- move the migration-specific qjson in migration/
# gpg: Signature made Mon 23 May 2016 18:15:09 BST using RSA key ID 657EF670
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/migration-2.7-1:
migration: regain control of images when migration fails to complete
savevm: fail if migration blockers are present
migration: Promote improved autoconverge commands out of experimental state
migration/qjson: Drop gratuitous use of QOM
migration: Move qjson.[ch] to migration/
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/Makefile.objs')
| -rw-r--r-- | migration/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/migration/Makefile.objs b/migration/Makefile.objs index 0cac6d707a..d25ff483eb 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -2,6 +2,7 @@ common-obj-y += migration.o tcp.o common-obj-y += vmstate.o common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o common-obj-y += xbzrle.o postcopy-ram.o +common-obj-y += qjson.o common-obj-$(CONFIG_RDMA) += rdma.o common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o |