diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 13:09:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 13:09:51 +0100 |
| commit | 718d7f4f9cf772e5784093d8e6085680a235acdb (patch) | |
| tree | e6754e6f1f280fa1530fe3a20a0f30cb6988ab83 /block/io.c | |
| parent | ed6458726a9d987f5466f7b92469085d2a2d3685 (diff) | |
| parent | 593ed6f0a3c827a13a274e47f6fa980344234f9c (diff) | |
| download | qemu-718d7f4f9cf772e5784093d8e6085680a235acdb.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 17 Jul 2017 16:40:18 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
block: fix shadowed variable in bdrv_co_pdiscard
util/aio-win32: Only select on what we are actually waiting for
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/io.c')
| -rw-r--r-- | block/io.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/block/io.c b/block/io.c index aece54c015..d9dc822173 100644 --- a/block/io.c +++ b/block/io.c @@ -2359,7 +2359,6 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, assert(max_pdiscard >= bs->bl.request_alignment); while (bytes > 0) { - int ret; int num = bytes; if (head) { |