From patchwork Mon Jun 10 12:26:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 250241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6ACD22C0079 for ; Mon, 10 Jun 2013 22:53:19 +1000 (EST) Received: from localhost ([::1]:35551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Um1DY-0001kE-FT for incoming@patchwork.ozlabs.org; Mon, 10 Jun 2013 08:29:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Um1BJ-0006Zf-9i for qemu-devel@nongnu.org; Mon, 10 Jun 2013 08:26:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Um1BG-00033u-IK for qemu-devel@nongnu.org; Mon, 10 Jun 2013 08:26:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Um1BG-00033n-B0 for qemu-devel@nongnu.org; Mon, 10 Jun 2013 08:26:38 -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 r5ACQZ9d021132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 10 Jun 2013 08:26:35 -0400 Received: from localhost (ovpn-112-37.ams2.redhat.com [10.36.112.37]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5ACQXFl014228; Mon, 10 Jun 2013 08:26:34 -0400 From: Stefan Hajnoczi To: Date: Mon, 10 Jun 2013 14:26:04 +0200 Message-Id: <1370867173-25755-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1370867173-25755-1-git-send-email-stefanha@redhat.com> References: <1370867173-25755-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 , Ping Fan Liu , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v3 08/17] block/iscsi: drop iscsi_process_flush() 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 iscsi_process_flush(). Signed-off-by: Stefan Hajnoczi --- block/iscsi.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index f7199c1..e2041ca 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -147,13 +147,6 @@ static const AIOCBInfo iscsi_aiocb_info = { static void iscsi_process_read(void *arg); static void iscsi_process_write(void *arg); -static int iscsi_process_flush(void *arg) -{ - IscsiLun *iscsilun = arg; - - return iscsi_queue_length(iscsilun->iscsi) > 0; -} - static void iscsi_set_events(IscsiLun *iscsilun) { @@ -167,7 +160,7 @@ iscsi_set_events(IscsiLun *iscsilun) qemu_aio_set_fd_handler(iscsi_get_fd(iscsi), iscsi_process_read, (ev & POLLOUT) ? iscsi_process_write : NULL, - iscsi_process_flush, + NULL, iscsilun); }