From patchwork Fri Nov 29 14:58:40 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: 295428 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 CC7E72C00AD for ; Sat, 30 Nov 2013 02:03:20 +1100 (EST) Received: from localhost ([::1]:47745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPbC-0001WL-9F for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 10:03:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPXn-0005Ok-G4 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 09:59:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmPXf-0008KO-0R for qemu-devel@nongnu.org; Fri, 29 Nov 2013 09:59:47 -0500 Received: from mail-ie0-x22a.google.com ([2607:f8b0:4001:c03::22a]:59535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPXe-0008KK-QU for qemu-devel@nongnu.org; Fri, 29 Nov 2013 09:59:38 -0500 Received: by mail-ie0-f170.google.com with SMTP id qd12so16622780ieb.15 for ; Fri, 29 Nov 2013 06:59:38 -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=0CxKtokFQD7n9R66tgLSiuJQDr+2cPUVjYP9CvXqEAE=; b=Mipw+dx3fpUL2b0yRZBTbeQyK5emzV2cj4r6fB2Mjy+ZfoCNhuV6Sauqut3dNmlzVb ixUlqgApc6k6f7nSoYk8QTl03K6QJ6MEheQ0O7KB2CxRYrvZ/DcS90I21xC5pG4acFPx XLg+ceHsBMfWUgKEVeDoEESgHQmLsmYX4sG+aKRYOK1pMxagGd7m8g9Zt4PLl/IuQcoT wvW8UhDX5a0Fvfs1LVCAP7wm/IEO8MFaM9GIyIiSfB9ryPN8QF7zKLyMtd6lGkw7HCtP r2fPy6ApEUzcjKf/eK7b3wJ+dT/FkfzQb2q9utmxa7IiPoCpqffK88ClxbmzxMBVFDaZ VvFw== X-Received: by 10.50.122.38 with SMTP id lp6mr6738951igb.30.1385737178305; Fri, 29 Nov 2013 06:59:38 -0800 (PST) Received: from localhost (13.pool62-37-66.dynamic.orange.es. [62.37.66.13]) by mx.google.com with ESMTPSA id i11sm50653522igh.0.2013.11.29.06.59.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Nov 2013 06:59:37 -0800 (PST) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 15:58:40 +0100 Message-Id: <1385737124-13964-10-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1385737124-13964-1-git-send-email-marcandre.lureau@gmail.com> References: <1385737124-13964-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:4001:c03::22a Cc: pbonzini@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 09/13] 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 --- nbd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/nbd.c b/nbd.c index f847940..3af9d17 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) {