From patchwork Mon Jul 1 12:18:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 256111 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 C1B112C00A1 for ; Mon, 1 Jul 2013 22:28:52 +1000 (EST) Received: from localhost ([::1]:32858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtdDu-0002IK-I8 for incoming@patchwork.ozlabs.org; Mon, 01 Jul 2013 08:28:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtdDc-0002I6-SW for qemu-devel@nongnu.org; Mon, 01 Jul 2013 08:28:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Utd4g-0000ro-JG for qemu-devel@nongnu.org; Mon, 01 Jul 2013 08:19:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Utd4g-0000rc-8V for qemu-devel@nongnu.org; Mon, 01 Jul 2013 08:19:18 -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 r61CJHdO023721 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 1 Jul 2013 08:19:17 -0400 Received: from localhost (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r61CJGpB029893; Mon, 1 Jul 2013 08:19:17 -0400 From: Stefan Hajnoczi To: Date: Mon, 1 Jul 2013 14:18:40 +0200 Message-Id: <1372681129-18528-10-git-send-email-stefanha@redhat.com> In-Reply-To: <1372681129-18528-1-git-send-email-stefanha@redhat.com> References: <1372681129-18528-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 , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v5 09/18] 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 0bbf0b1..23c46ed 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); }