diff options
| author | Peter Maydell | 2017-03-24 15:14:18 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-03-24 15:14:18 +0100 |
| commit | ea2afcf5b6727a577cf561fd8fe0d8c397ecc927 (patch) | |
| tree | 6036f725cedaf78c0720043df3705164ff4cbbf9 /block | |
| parent | boot-serial-test: use -no-shutdown (diff) | |
| parent | trace: Avoid abuse of amdvi_mmio_read (diff) | |
| download | qemu-ea2afcf5b6727a577cf561fd8fe0d8c397ecc927.tar.gz qemu-ea2afcf5b6727a577cf561fd8fe0d8c397ecc927.tar.xz qemu-ea2afcf5b6727a577cf561fd8fe0d8c397ecc927.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 24 Mar 2017 14:08:41 GMT
# 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/tracing-pull-request:
trace: Avoid abuse of amdvi_mmio_read
trace: Fix incorrect megasas trace parameters
trace: Fix backwards mirror_yield parameters
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/mirror.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/mirror.c b/block/mirror.c index ca4baa510a..9e2fecc15e 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -634,7 +634,8 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) } if (s->in_flight >= MAX_IN_FLIGHT) { - trace_mirror_yield(s, s->in_flight, s->buf_free_count, -1); + trace_mirror_yield(s, UINT64_MAX, s->buf_free_count, + s->in_flight); mirror_wait_for_io(s); continue; } @@ -809,7 +810,7 @@ static void coroutine_fn mirror_run(void *opaque) s->common.iostatus == BLOCK_DEVICE_IO_STATUS_OK) { if (s->in_flight >= MAX_IN_FLIGHT || s->buf_free_count == 0 || (cnt == 0 && s->in_flight > 0)) { - trace_mirror_yield(s, s->in_flight, s->buf_free_count, cnt); + trace_mirror_yield(s, cnt, s->buf_free_count, s->in_flight); mirror_wait_for_io(s); continue; } else if (cnt != 0) { |