From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4A9Z-00021R-Uy for qemu-devel@nongnu.org; Wed, 02 Dec 2015 11:21:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4A9V-0006za-VE for qemu-devel@nongnu.org; Wed, 02 Dec 2015 11:21:13 -0500 From: Kevin Wolf Date: Wed, 2 Dec 2015 17:21:00 +0100 Message-Id: <1449073260-12483-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1449073260-12483-1-git-send-email-kwolf@redhat.com> References: <1449073260-12483-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 2/2] blkdebug: silence warning under qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: "Michael S. Tsirkin" make check always outputs warnings, this is not nice. Disable blkdebug warnings under qtest. Signed-off-by: Michael S. Tsirkin Message-id: 1448883874-17933-1-git-send-email-mst@redhat.com Signed-off-by: Max Reitz --- block/blkdebug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 6860a2b..dee3a0e 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); -- 1.8.3.1