From patchwork Sun Dec 1 21:23:42 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: 295732 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 7C8452C0092 for ; Mon, 2 Dec 2013 09:20:00 +1100 (EST) Received: from localhost ([::1]:32930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnEXH-0000q6-EQ for incoming@patchwork.ozlabs.org; Sun, 01 Dec 2013 16:26:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnEVJ-0006cG-2t for qemu-devel@nongnu.org; Sun, 01 Dec 2013 16:24:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnEVA-00082X-KZ for qemu-devel@nongnu.org; Sun, 01 Dec 2013 16:24:36 -0500 Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]:49437) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnEVA-00082R-EJ for qemu-devel@nongnu.org; Sun, 01 Dec 2013 16:24:28 -0500 Received: by mail-qa0-f46.google.com with SMTP id f11so3652163qae.12 for ; Sun, 01 Dec 2013 13:24:27 -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=b+STU6MxrK9hFJXVcCzNaRt2cFebKdq7XDTE22ZTlQ8=; b=UNByejukOmfxfEqs19fjPwBNJEDrJIcHd14+n9fzSWpLYlMMLf6y7bedM5vazfmy5E FBasGlQu+GMKcb/H4lJqvZt2feKkkmLvPLrFkQIO5HC9Sfg5j8idCyq8juI2btiZZIZZ dx+Qv9WezN/+GlZ2XdCCHgP2veCZPZ8FKGyrpkdEQOshIDi9xLJwOThojKB11aldXJt/ UM5jPR/gnA82b9URGdsmyIl3V/5onMzBvQ/UNMrEOOR/TWiLeWLlVPqyMoccY9Gruv9a 4Jk5Bd1brYLpfLSKh2EiyRK4DUYhgwaNfotD7r2i9ZxPiG75SP7dwX6DdJ9eqEYY8R4V /ARQ== X-Received: by 10.224.151.79 with SMTP id b15mr76703360qaw.28.1385933067759; Sun, 01 Dec 2013 13:24:27 -0800 (PST) Received: from localhost (105.Red-83-60-241.dynamicIP.rima-tde.net. [83.60.241.105]) by mx.google.com with ESMTPSA id c7sm32688165qar.9.2013.12.01.13.24.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Dec 2013 13:24:27 -0800 (PST) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Sun, 1 Dec 2013 22:23:42 +0100 Message-Id: <1385933027-21261-10-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1385933027-21261-1-git-send-email-marcandre.lureau@gmail.com> References: <1385933027-21261-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: 2607:f8b0:400d:c00::22e Cc: pbonzini@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCHv2 09/14] nbd: don't change socket block during negotiate 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 The caller might handle non-blocking using coroutine. Leave the choice to the caller to use a blocking or non-blocking negotiate. Signed-off-by: Marc-André Lureau --- block/nbd-client.c | 1 + nbd.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 1abfc6a..693110d 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -348,6 +348,7 @@ int nbd_client_session_init(NbdClientSession *client, int ret; /* NBD handshake */ + qemu_set_block(sock); ret = nbd_receive_negotiate(sock, client->export_name, &client->nbdflags, &client->size, &client->blocksize); diff --git a/nbd.c b/nbd.c index f847940..030f56b 100644 --- a/nbd.c +++ b/nbd.c @@ -443,7 +443,6 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags, TRACE("Receiving negotiation."); - qemu_set_block(csock); rc = -EINVAL; if (read_sync(csock, buf, 8) != 8) { @@ -558,7 +557,6 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags, rc = 0; fail: - qemu_set_nonblock(csock); return rc; }