diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-12-02 16:38:03 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-12-02 16:38:03 +0100 |
| commit | ab7fe3a29ab1c6f5a1fff864e455d6d53dde62b5 (patch) | |
| tree | 8713395eaf503f6626bd5655b30fc4a657922f93 | |
| parent | c2551b47c9b9465962c4000268eda1307f55614a (diff) | |
| parent | 20873526a329e2145522c29775542dba2900ebe0 (diff) | |
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-02' into queue-block
One block patch for qemu 2.5-rc3.
# gpg: Signature made Wed Dec 2 16:29:17 2015 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
* mreitz/tags/pull-block-for-kevin-2015-12-02:
blkdebug: silence warning under qtest
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/blkdebug.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/block/blkdebug.c b/block/blkdebug.c index 6860a2ba2f..dee3a0edfc 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -30,6 +30,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qint.h" #include "qapi/qmp/qstring.h" +#include "sysemu/qtest.h" typedef struct BDRVBlkdebugState { int state; @@ -583,9 +584,13 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) remove_rule(rule); QLIST_INSERT_HEAD(&s->suspended_reqs, &r, next); - printf("blkdebug: Suspended request '%s'\n", r.tag); + if (!qtest_enabled()) { + printf("blkdebug: Suspended request '%s'\n", r.tag); + } qemu_coroutine_yield(); - printf("blkdebug: Resuming request '%s'\n", r.tag); + if (!qtest_enabled()) { + printf("blkdebug: Resuming request '%s'\n", r.tag); + } QLIST_REMOVE(&r, next); g_free(r.tag); |