From patchwork Mon Apr 11 14:31:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bligh X-Patchwork-Id: 8802961 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4CC8B9F3D1 for ; Mon, 11 Apr 2016 14:31:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3522202AE for ; Mon, 11 Apr 2016 14:31:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1CFF520272 for ; Mon, 11 Apr 2016 14:31:47 +0000 (UTC) Received: from localhost ([::1]:56133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apcsU-0001cR-32 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 Apr 2016 10:31:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apcsI-0001Vc-3a for qemu-devel@nongnu.org; Mon, 11 Apr 2016 10:31:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apcsE-0006Dh-El for qemu-devel@nongnu.org; Mon, 11 Apr 2016 10:31:34 -0400 Received: from mail.avalus.com ([89.16.176.221]:40331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apcsE-0006C8-9g for qemu-devel@nongnu.org; Mon, 11 Apr 2016 10:31:30 -0400 Received: by mail.avalus.com (Postfix) with ESMTPSA id D8504C560B0; Mon, 11 Apr 2016 15:31:25 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alex.org.uk; s=mail; t=1460385085; bh=DsLplqKk5UT8zxegnBlGevpoRy6s0ZXSp1HXcES2ysU=; h=From:To:Cc:Subject:Date; b=isRfscyozhj28+iCHxItyUiq9/rJDtM73pbFo/CUCoGCFcI3TYe7KIgAvAby7f24T EGXeU3i8POCDMABCybjKSZ3CHu/27jfH6YdnvDEkKCiykk9tHiH7N0fyL9ke2A5GGT 6TjJyj7XOkoyr/VNvmJXE+JbDmJxOKnImZ2zG99o= From: Alex Bligh To: "qemu-devel@nongnu.org" Date: Mon, 11 Apr 2016 15:31:23 +0100 Message-Id: <1460385083-28246-1-git-send-email-alex@alex.org.uk> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.16.176.221 Subject: [Qemu-devel] [PATCH] Make nbd-tester-client use FIXED_NEWSTYLE negotiation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wouter Verhelst , Alex Bligh Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alex Bligh --- tests/run/nbd-tester-client.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/run/nbd-tester-client.c b/tests/run/nbd-tester-client.c index 06396a7..1b99fa8 100644 --- a/tests/run/nbd-tester-client.c +++ b/tests/run/nbd-tester-client.c @@ -342,6 +342,8 @@ int setup_connection_common(int sock, char* name, CONNECTION_TYPE ctype, int* se u64 tmp64; uint64_t mymagic = (name ? opts_magic : cliserv_magic); uint32_t tmp32 = 0; + uint16_t handshakeflags = 0; + uint32_t negotiationflags = 0; if(ctype