From patchwork Thu Apr 11 15:44:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 235815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 363CE2C00B8 for ; Fri, 12 Apr 2013 01:47:26 +1000 (EST) Received: from localhost ([::1]:41815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQJie-0005qg-0G for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 11:47:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQJhi-0004u9-M0 for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:46:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQJhf-0002zz-To for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:46:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQJhf-0002zr-LA for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:46:23 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3BFjLoM024265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Apr 2013 11:45:21 -0400 Received: from localhost (ovpn-112-31.ams2.redhat.com [10.36.112.31]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3BFjKhE024129; Thu, 11 Apr 2013 11:45:20 -0400 From: Stefan Hajnoczi To: Date: Thu, 11 Apr 2013 17:44:44 +0200 Message-Id: <1365695085-27970-13-git-send-email-stefanha@redhat.com> In-Reply-To: <1365695085-27970-1-git-send-email-stefanha@redhat.com> References: <1365695085-27970-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Paolo Bonzini , Anthony Liguori , pingfank@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC 12/13] thread-pool: drop thread_pool_active() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org .io_flush() is no longer called so drop thread_pool_active(). The block layer is the only thread-pool.c user and it already tracks in-flight requests, therefore we do not need thread_pool_active(). Signed-off-by: Stefan Hajnoczi --- thread-pool.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/thread-pool.c b/thread-pool.c index 0ebd4c2..096f007 100644 --- a/thread-pool.c +++ b/thread-pool.c @@ -197,12 +197,6 @@ restart: } } -static int thread_pool_active(EventNotifier *notifier) -{ - ThreadPool *pool = container_of(notifier, ThreadPool, notifier); - return !QLIST_EMPTY(&pool->head); -} - static void thread_pool_cancel(BlockDriverAIOCB *acb) { ThreadPoolElement *elem = (ThreadPoolElement *)acb; @@ -310,7 +304,7 @@ static void thread_pool_init_one(ThreadPool *pool, AioContext *ctx) QTAILQ_INIT(&pool->request_list); aio_set_event_notifier(ctx, &pool->notifier, event_notifier_ready, - thread_pool_active); + NULL); } ThreadPool *thread_pool_new(AioContext *ctx)