diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-20 16:51:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-20 16:51:43 +0100 |
| commit | 426c0df9e3e6e64c7ea489092c57088ca4d227d0 (patch) | |
| tree | e4880d0411a419ef368c030762e6b54bc8276be9 /tests | |
| parent | ee9dfed242610ecb91418270fd46b875ed56e201 (diff) | |
| parent | 88c5f205fa4c095db4c50eb7ad72816140206819 (diff) | |
| download | qemu-426c0df9e3e6e64c7ea489092c57088ca4d227d0.tar.gz qemu-426c0df9e3e6e64c7ea489092c57088ca4d227d0.tar.bz2 qemu-426c0df9e3e6e64c7ea489092c57088ca4d227d0.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/io-channel-3-for-upstream' into staging
Merge io-channels-3 partial branch
# gpg: Signature made Tue 20 Oct 2015 16:36:10 BST using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/io-channel-3-for-upstream:
util: pull Buffer code out of VNC module
coroutine: move into libqemuutil.a library
osdep: add qemu_fork() wrapper for safely handling signals
ui: convert VNC startup code to use SocketAddress
sockets: allow port to be NULL when listening on IP address
sockets: move qapi_copy_SocketAddress into qemu-sockets.c
sockets: add helpers for creating SocketAddress from a socket
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-coroutine.c | 4 | ||||
| -rw-r--r-- | tests/test-vmstate.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-coroutine.c b/tests/test-coroutine.c index b552d9f5e9..f5951cb1f1 100644 --- a/tests/test-coroutine.c +++ b/tests/test-coroutine.c @@ -12,8 +12,8 @@ */ #include <glib.h> -#include "block/coroutine.h" -#include "block/coroutine_int.h" +#include "qemu/coroutine.h" +#include "qemu/coroutine_int.h" /* * Check that qemu_in_coroutine() works diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 1d620e04fb..4d13bd09b3 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -27,7 +27,7 @@ #include "qemu-common.h" #include "migration/migration.h" #include "migration/vmstate.h" -#include "block/coroutine.h" +#include "qemu/coroutine.h" static char temp_file[] = "/tmp/vmst.test.XXXXXX"; static int temp_fd; |