From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atf6w-0003mb-Mi for qemu-devel@nongnu.org; Fri, 22 Apr 2016 13:43:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atf6v-0006fv-Ss for qemu-devel@nongnu.org; Fri, 22 Apr 2016 13:43:22 -0400 From: Kevin Wolf Date: Fri, 22 Apr 2016 19:42:42 +0200 Message-Id: <1461346962-4676-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1461346962-4676-1-git-send-email-kwolf@redhat.com> References: <1461346962-4676-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 13/13] block: Don't check throttled reqs in bdrv_requests_pending() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, berto@igalia.com, mreitz@redhat.com, eblake@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org Checking whether there are throttled requests requires going to the associated BlockBackend, which we want to avoid. All users of bdrv_requests_pending() already call bdrv_parent_drained_begin() first, which restarts all throttled requests, so no throttled requests can be left here and this is removal of dead code. Signed-off-by: Kevin Wolf --- block/io.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/block/io.c b/block/io.c index b239e97..4224044 100644 --- a/block/io.c +++ b/block/io.c @@ -177,17 +177,10 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs) bool bdrv_requests_pending(BlockDriverState *bs) { BdrvChild *child; - BlockBackendPublic *blkp = bs->blk ? blk_get_public(bs->blk) : NULL; if (!QLIST_EMPTY(&bs->tracked_requests)) { return true; } - if (blkp && !qemu_co_queue_empty(&blkp->throttled_reqs[0])) { - return true; - } - if (blkp && !qemu_co_queue_empty(&blkp->throttled_reqs[1])) { - return true; - } QLIST_FOREACH(child, &bs->children, next) { if (bdrv_requests_pending(child->bs)) { -- 1.8.3.1