From patchwork Mon Nov 18 12:25:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 292072 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 5150F2C0091 for ; Tue, 19 Nov 2013 00:03:48 +1100 (EST) Received: from localhost ([::1]:42682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNx9-00087f-NQ for incoming@patchwork.ozlabs.org; Mon, 18 Nov 2013 07:29:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNvI-0005fw-GV for qemu-devel@nongnu.org; Mon, 18 Nov 2013 07:27:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ViNv7-0006oi-Hg for qemu-devel@nongnu.org; Mon, 18 Nov 2013 07:27:24 -0500 Received: from mail-we0-x236.google.com ([2a00:1450:400c:c03::236]:50289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNv7-0006oZ-BE for qemu-devel@nongnu.org; Mon, 18 Nov 2013 07:27:13 -0500 Received: by mail-we0-f182.google.com with SMTP id q59so4105856wes.13 for ; Mon, 18 Nov 2013 04:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Gtgz8EsAvxBS425bprJmY/Qg+cFfYgzmCsXMTivI0IA=; b=f91KLs3RPXTfMYv2ghs47tmdoUgCGFqhhGcKdUEs6Hg+S/3UQ5zXjrBar7E/x6SaHb f+A9HYFVXDKyNZjnIdVc0zhP240pM4BmP1h8Fri7+FyU2HFiyjwmLP9ac15AVOX96Trl s4zhuAVK4S/wqbFa9CpLerfluXFoSNnFWLC4GJZf/6eIACobNEumyiRdqvN2m4AZTkCg iq/Lp8fSSNrnKmz6h6CDK2ffbsW5U6cZ4XjcI9bRNai6EBXjV81XbYo6UDQKUhVIsDZg fMZZmRPRleBfDs3+LluO8jwMPzTIcNc0Bp/pOfqs7+4WszKVJlRMh79ITuceuzgzqYqK 0ToA== X-Received: by 10.180.103.130 with SMTP id fw2mr7151153wib.34.1384777632545; Mon, 18 Nov 2013 04:27:12 -0800 (PST) Received: from localhost (nat-pool-cdg-t.redhat.com. [209.132.186.20]) by mx.google.com with ESMTPSA id y11sm23656409wie.7.2013.11.18.04.27.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Nov 2013 04:27:11 -0800 (PST) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 18 Nov 2013 13:25:19 +0100 Message-Id: <1384777531-14635-10-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384777531-14635-1-git-send-email-marcandre.lureau@gmail.com> References: <1384777531-14635-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::236 Cc: kwolf@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , jcody@redhat.com, kraxel@redhat.com, spice-devel@freedesktop.org Subject: [Qemu-devel] [PATCH 09/21] nbd: make session_close() idempotent 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 From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- block/nbd-client.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/nbd-client.c b/block/nbd-client.c index e29227b..c0ad2c2 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -337,7 +337,12 @@ static void nbd_teardown_connection(NbdClientSession *client) void nbd_client_session_close(NbdClientSession *client) { + if (!client->bs) { + return; + } + nbd_teardown_connection(client); + client->bs = NULL; } int nbd_client_session_init(NbdClientSession *client, BlockDriverState *bs,