From patchwork Thu Apr 16 12:18:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 461743 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 6137A1402F5 for ; Thu, 16 Apr 2015 22:22:45 +1000 (AEST) Received: from localhost ([::1]:36507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yiiod-0002Zi-89 for incoming@patchwork.ozlabs.org; Thu, 16 Apr 2015 08:22:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yiiny-0001Ic-OK for qemu-devel@nongnu.org; Thu, 16 Apr 2015 08:22:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yiinx-00069k-9P for qemu-devel@nongnu.org; Thu, 16 Apr 2015 08:22:02 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:47178 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yiinw-00069H-TG for qemu-devel@nongnu.org; Thu, 16 Apr 2015 08:22:01 -0400 Received: (qmail 19205 invoked by uid 89); 16 Apr 2015 12:22:00 -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/20330. hbedv: 8.3.30.16/7.11.224.132. spamassassin: 3.4.0. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.209831 secs); 16 Apr 2015 12:22:00 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 16 Apr 2015 12:21:58 -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 843DDE0063; Thu, 16 Apr 2015 14:21:28 +0200 (CEST) Received: by lieven-vm-neu (Postfix, from userid 1000) id 2F11D204AE; Thu, 16 Apr 2015 14:18:51 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Thu, 16 Apr 2015 14:18:41 +0200 Message-Id: <1429186730-3866-2-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1429186730-3866-1-git-send-email-pl@kamp.de> References: <1429186730-3866-1-git-send-email-pl@kamp.de> 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 for-2.4 01/10] 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 --- block/iscsi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index ba33290..be8af46 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1501,6 +1501,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)); @@ -1514,6 +1517,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);