From patchwork Thu Apr 11 15:44:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 235832 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 49B982C00B8 for ; Fri, 12 Apr 2013 02:58:25 +1000 (EST) Received: from localhost ([::1]:42734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQKpL-0001o6-D0 for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 12:58:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQJh1-0004QT-Jq for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:45:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQJgw-0002qb-QP for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:45:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13694) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQJgw-0002qT-Ij for qemu-devel@nongnu.org; Thu, 11 Apr 2013 11:45:38 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3BFj0IE023428 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Apr 2013 11:45:00 -0400 Received: from localhost (ovpn-112-31.ams2.redhat.com [10.36.112.31]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3BFiwUS006030; Thu, 11 Apr 2013 11:44:59 -0400 From: Stefan Hajnoczi To: Date: Thu, 11 Apr 2013 17:44:38 +0200 Message-Id: <1365695085-27970-7-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.25 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 06/13] 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 92d6eae..2f1a325 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); }