diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-18 10:27:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-18 10:27:57 +0100 |
| commit | 4b887ae65880bf7eae53ba8af40599581fe759e5 (patch) | |
| tree | 613a677aad1e933340c712ce5da01bb007a762de | |
| parent | 5f0e775348082c355769a3df612e055abea61c06 (diff) | |
| parent | 92b6a160871e96ce639da7c94e6ab7e17eae376e (diff) | |
| download | qemu-4b887ae65880bf7eae53ba8af40599581fe759e5.tar.gz | |
Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging
Fix 'make docker-test-mingw@fedora'
Peter,
This is the single patch that stalls patchew's mingw testing. Since it
is small and trivial, let's have it in 2.7.
Fam
# gpg: Signature made Wed 17 Aug 2016 13:13:53 BST
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/docker-pull-request:
curl: Cast fd to int for DPRINTF
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | block/curl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/curl.c b/block/curl.c index da9f5e85de..426fb4d674 100644 --- a/block/curl.c +++ b/block/curl.c @@ -169,7 +169,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action, state->sock_fd = fd; s = state->s; - DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, fd); + DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, (int)fd); switch (action) { case CURL_POLL_IN: aio_set_fd_handler(s->aio_context, fd, false, |