From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56628)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ronniesahlberg@gmail.com>) id 1Yi9c3-0007n6-0P
	for qemu-devel@nongnu.org; Tue, 14 Apr 2015 18:47:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ronniesahlberg@gmail.com>) id 1Yi9by-0003yj-BA
	for qemu-devel@nongnu.org; Tue, 14 Apr 2015 18:47:22 -0400
MIME-Version: 1.0
In-Reply-To: <1429000631-649-1-git-send-email-pl@kamp.de>
References: <1429000631-649-1-git-send-email-pl@kamp.de>
Date: Tue, 14 Apr 2015 15:47:17 -0700
Message-ID: <CAN05THTUXbDjQ2ROnSkogmXMkGowwfsEa1uv148at6XS=9dG-Q@mail.gmail.com>
From: ronnie sahlberg <ronniesahlberg@gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH] block/iscsi: do not forget to logout from
	target
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Lieven <pl@kamp.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel <qemu-devel@nongnu.org>, qemu-block@nongnu.org, qemu-stable@nongnu.org

Reviewed-By: Ronnie Sahlberg <ronniesahlberg@gmail.com>

On Tue, Apr 14, 2015 at 1:37 AM, Peter Lieven <pl@kamp.de> wrote:
> We actually were always impolitely dropping the connection and
> not cleanly logging out.
>
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  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);
> --
> 1.9.1
>