diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-15 11:55:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-15 11:55:54 +0100 |
| commit | 32d9c5613e3cbb5d90daa3a1c629fb389e749d03 (patch) | |
| tree | 9a93c3a76f7ef0832a1467a766e1ddb17ae87168 /tests/Makefile | |
| parent | 88e6599669a2f8c9ec5b8baa62178bc3dfc340ae (diff) | |
| parent | 5b0e9dd46fbda5152566a4a26fd96bc0d0452bf7 (diff) | |
| download | qemu-32d9c5613e3cbb5d90daa3a1c629fb389e749d03.tar.gz qemu-32d9c5613e3cbb5d90daa3a1c629fb389e749d03.tar.bz2 qemu-32d9c5613e3cbb5d90daa3a1c629fb389e749d03.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20141015' into staging
migration/next for 20141015
# gpg: Signature made Wed 15 Oct 2014 09:21:54 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20141015:
migration: catch unknown flag combinations in ram_load
qemu-file: Move stdio implementation to qemu-file-stdio.c
qemu-file: Move unix and socket implementations to qemu-file-unix.c
qemu-file: Use qemu_file_is_writable() on stdio_fclose()
qemu-file: Make qemu_file_is_writable() non-static
qemu-file: Add copyright header to qemu-file.c
vmstate: Allow dynamic allocation for VBUFFER during migration
block/migration: Disable cache invalidate for incoming migration
Tests: QEMUSizedBuffer/QEMUBuffer
QEMUSizedBuffer based QEMUFile
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 95deff0e2f..16f0e4c805 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -258,8 +258,8 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.a tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ - vmstate.o qemu-file.o \ - libqemuutil.a + vmstate.o qemu-file.o qemu-file-unix.o \ + libqemuutil.a libqemustub.a tests/test-qapi-types.c tests/test-qapi-types.h :\ $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py |