From patchwork Tue Apr 14 08:37:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 461096 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C929140276 for ; Tue, 14 Apr 2015 18:40:56 +1000 (AEST) Received: from localhost ([::1]:54823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhwOq-0007aY-NK for incoming@patchwork.ozlabs.org; Tue, 14 Apr 2015 04:40:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhwOO-0007Ce-0D for qemu-devel@nongnu.org; Tue, 14 Apr 2015 04:40:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YhwOJ-0005yP-7V for qemu-devel@nongnu.org; Tue, 14 Apr 2015 04:40:23 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:38206 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhwOI-0005xB-SU for qemu-devel@nongnu.org; Tue, 14 Apr 2015 04:40:19 -0400 Received: (qmail 7904 invoked by uid 89); 14 Apr 2015 08:40:16 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98.6/20322. hbedv: 8.3.30.16/7.11.224.22. spamassassin: 3.4.0. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.404561 secs); 14 Apr 2015 08:40:16 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 14 Apr 2015 08:40:14 -0000 X-GL_Whitelist: yes Received: from lieven-vm-neu (lieven-vm.kamp-intra.net [172.21.12.69]) by dns.kamp-intra.net (Postfix) with ESMTP id 77D91E0060; Tue, 14 Apr 2015 10:39:44 +0200 (CEST) Received: by lieven-vm-neu (Postfix, from userid 1000) id 1F36E20262; Tue, 14 Apr 2015 10:37:13 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 14 Apr 2015 10:37:11 +0200 Message-Id: <1429000631-649-1-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: pbonzini@redhat.com, Peter Lieven , ronniesahlberg@gmail.com, qemu-block@nongnu.org, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH] block/iscsi: do not forget to logout from target 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 We actually were always impolitely dropping the connection and not cleanly logging out. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Lieven Reviewed-By: Ronnie Sahlberg --- block/iscsi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index ab20e4d..0b6d3dd 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1503,6 +1503,9 @@ out: if (ret) { if (iscsi != NULL) { + if (iscsi_is_logged_in(iscsi)) { + iscsi_logout_sync(iscsi); + } iscsi_destroy_context(iscsi); } memset(iscsilun, 0, sizeof(IscsiLun)); @@ -1516,6 +1519,9 @@ static void iscsi_close(BlockDriverState *bs) struct iscsi_context *iscsi = iscsilun->iscsi; iscsi_detach_aio_context(bs); + if (iscsi_is_logged_in(iscsi)) { + iscsi_logout_sync(iscsi); + } iscsi_destroy_context(iscsi); g_free(iscsilun->zeroblock); g_free(iscsilun->allocationmap);