diff options
| author | Peter Maydell | 2015-10-20 17:51:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-10-20 17:51:43 +0200 |
| commit | 426c0df9e3e6e64c7ea489092c57088ca4d227d0 (patch) | |
| tree | e4880d0411a419ef368c030762e6b54bc8276be9 /migration/qemu-file-buf.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20151020-1' into... (diff) | |
| parent | util: pull Buffer code out of VNC module (diff) | |
| download | qemu-426c0df9e3e6e64c7ea489092c57088ca4d227d0.tar.gz qemu-426c0df9e3e6e64c7ea489092c57088ca4d227d0.tar.xz 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 'migration/qemu-file-buf.c')
| -rw-r--r-- | migration/qemu-file-buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/qemu-file-buf.c b/migration/qemu-file-buf.c index e3fd0859d6..49516b8643 100644 --- a/migration/qemu-file-buf.c +++ b/migration/qemu-file-buf.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qemu/iov.h" #include "qemu/sockets.h" -#include "block/coroutine.h" +#include "qemu/coroutine.h" #include "migration/migration.h" #include "migration/qemu-file.h" #include "migration/qemu-file-internal.h" |