From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upj31-0000U0-8K for qemu-devel@nongnu.org; Thu, 20 Jun 2013 13:53:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Upj2z-0004Kf-UW for qemu-devel@nongnu.org; Thu, 20 Jun 2013 13:53:27 -0400 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:39494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpiwX-0002Hx-Tx for qemu-devel@nongnu.org; Thu, 20 Jun 2013 13:46:46 -0400 Received: by mail-wi0-f170.google.com with SMTP id ey16so2183492wid.1 for ; Thu, 20 Jun 2013 10:46:45 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" Date: Thu, 20 Jun 2013 19:46:05 +0200 Message-Id: <1371750371-18491-7-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1371750371-18491-1-git-send-email-marcandre.lureau@redhat.com> References: <1371750371-18491-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 06/12] nbd: make session_close() idempotent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: spice-devel@lists.freedesktop.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 b7eea21..c49be30 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -352,7 +352,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, -- 1.8.3.rc1.49.g8d97506