From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSQr-0002Sd-6I for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:44:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnSQo-0006zQ-PI for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:44:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSQo-0006zH-Hx for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:44:38 -0400 From: Stefan Hajnoczi Date: Fri, 14 Jun 2013 13:43:59 +0200 Message-Id: <1371210243-6099-14-git-send-email-stefanha@redhat.com> In-Reply-To: <1371210243-6099-1-git-send-email-stefanha@redhat.com> References: <1371210243-6099-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v4 13/17] block/ssh: drop return_true() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Anthony Liguori , Ping Fan Liu , Stefan Hajnoczi .io_flush() is no longer called so drop return_true(). Signed-off-by: Stefan Hajnoczi --- block/ssh.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 246a70d..ed525cc 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -725,14 +725,6 @@ static void restart_coroutine(void *opaque) qemu_coroutine_enter(co, NULL); } -/* Always true because when we have called set_fd_handler there is - * always a request being processed. - */ -static int return_true(void *opaque) -{ - return 1; -} - static coroutine_fn void set_fd_handler(BDRVSSHState *s) { int r; @@ -751,7 +743,7 @@ static coroutine_fn void set_fd_handler(BDRVSSHState *s) DPRINTF("s->sock=%d rd_handler=%p wr_handler=%p", s->sock, rd_handler, wr_handler); - qemu_aio_set_fd_handler(s->sock, rd_handler, wr_handler, return_true, co); + qemu_aio_set_fd_handler(s->sock, rd_handler, wr_handler, NULL, co); } static coroutine_fn void clear_fd_handler(BDRVSSHState *s) -- 1.8.1.4