From patchwork Wed Apr 6 03:35:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8757891 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 992A79F36E for ; Wed, 6 Apr 2016 03:35:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA5C72034A for ; Wed, 6 Apr 2016 03:35:38 +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 42F13202BE for ; Wed, 6 Apr 2016 03:35:38 +0000 (UTC) Received: from localhost ([::1]:40615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aneFl-0003ds-KK for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Apr 2016 23:35:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aneFU-0003ca-79 for qemu-devel@nongnu.org; Tue, 05 Apr 2016 23:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aneFP-0002OD-OH for qemu-devel@nongnu.org; Tue, 05 Apr 2016 23:35:20 -0400 Received: from resqmta-po-11v.sys.comcast.net ([2001:558:fe16:19:96:114:154:170]:57467 helo=resqmta-ch2-11v.sys.comcast.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aneFP-0002Nb-JN for qemu-devel@nongnu.org; Tue, 05 Apr 2016 23:35:15 -0400 Received: from resomta-po-17v.sys.comcast.net ([96.114.154.241]) by comcast with SMTP id neFOaaotqvJlgneFPa0VBv; Wed, 06 Apr 2016 03:35:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1459913715; bh=DIU3XCYHXUGwYT3tWtIe0/yODBOzgtJHRkXFN43Y6Ak=; h=Received:Received:From:To:Subject:Date:Message-Id; b=jvJ9Q1axBc7+CTaNu+95lRhzL8H5h2CMI4fpjVbShQ5bMJQpvmG5B1Ez5fkAqDi6u dcQ3FDAsil2MsrhhLGu7ax2/zdaaz0I5YGFFnNRH6vTXyIpn75N6kzE/SO51hx2NLA 6w7XoL44YFsmMPDWJKUnTrCWupWRo03YnrFpPsMd/gzLFhbRMijdQJICBN42uXaLn2 4WB00HjPorp7RYWVSKvcHRz8ItRt8XJqGy/fw19GLMvEBvDfRsN8cOAc9wnq4BuQa/ /CCl0iQtHzxyIkLCYkUCz9GdWOvYPDr+QGXXOHaGRtEFsFaL3nCqSUZjCOO1PvDBBD tc4+ftFQ3Wx2Q== Received: from red.redhat.com ([24.10.254.122]) by resomta-po-17v.sys.comcast.net with comcast id erb51s0052fD5rL01rbE7a; Wed, 06 Apr 2016 03:35:15 +0000 From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 5 Apr 2016 21:35:04 -0600 Message-Id: <1459913704-19949-4-git-send-email-eblake@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459913704-19949-1-git-send-email-eblake@redhat.com> References: <1459913704-19949-1-git-send-email-eblake@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:558:fe16:19:96:114:154:170 Cc: pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 3/3] nbd: Improve debug traces on little-endian 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org 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 Print debug tracing messages while data is still in native ordering, rather than after we've potentially swapped it into network order for transmission. Also, it's nice if the server mentions what it is replying, to correlate it to with what the client says it is receiving. Signed-off-by: Eric Blake --- nbd/client.c | 8 ++++---- nbd/server.c | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nbd/client.c b/nbd/client.c index 6f0541d..602768e 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -629,16 +629,16 @@ ssize_t nbd_send_request(QIOChannel *ioc, struct nbd_request *request) uint8_t buf[NBD_REQUEST_SIZE]; ssize_t ret; + TRACE("Sending request to server: " + "{ .from = %" PRIu64", .len = %u, .handle = %" PRIu64", .type=%i}", + request->from, request->len, request->handle, request->type); + cpu_to_be32w((uint32_t*)buf, NBD_REQUEST_MAGIC); cpu_to_be32w((uint32_t*)(buf + 4), request->type); cpu_to_be64w((uint64_t*)(buf + 8), request->handle); cpu_to_be64w((uint64_t*)(buf + 16), request->from); cpu_to_be32w((uint32_t*)(buf + 24), request->len); - TRACE("Sending request to server: " - "{ .from = %" PRIu64", .len = %u, .handle = %" PRIu64", .type=%i}", - request->from, request->len, request->handle, request->type); - ret = write_sync(ioc, buf, sizeof(buf)); if (ret < 0) { return ret; diff --git a/nbd/server.c b/nbd/server.c index 98e3957..6d9c15a 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -656,6 +656,9 @@ static ssize_t nbd_send_reply(QIOChannel *ioc, struct nbd_reply *reply) reply->error = system_errno_to_nbd_errno(reply->error); + TRACE("Sending response to client: { .error = %d, handle = %" PRIu64 " }", + reply->error, reply->handle); + /* Reply [ 0 .. 3] magic (NBD_REPLY_MAGIC) [ 4 .. 7] error (0 == no error) @@ -665,8 +668,6 @@ static ssize_t nbd_send_reply(QIOChannel *ioc, struct nbd_reply *reply) stl_be_p(buf + 4, reply->error); stq_be_p(buf + 8, reply->handle); - TRACE("Sending response to client"); - ret = write_sync(ioc, buf, sizeof(buf)); if (ret < 0) { return ret;