From nobody Tue Feb 10 19:14:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499441887750917.4247766756764; Fri, 7 Jul 2017 08:38:07 -0700 (PDT) Received: from localhost ([::1]:57167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTVKY-0007D9-EC for importer@patchew.org; Fri, 07 Jul 2017 11:38:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTVCH-0000s9-8M for qemu-devel@nongnu.org; Fri, 07 Jul 2017 11:29:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTVCE-0001CB-28 for qemu-devel@nongnu.org; Fri, 07 Jul 2017 11:29:33 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:36842 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dTVCD-00019z-MM for qemu-devel@nongnu.org; Fri, 07 Jul 2017 11:29:29 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v67FTIuU028047; Fri, 7 Jul 2017 18:29:20 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Fri, 7 Jul 2017 18:29:14 +0300 Message-Id: <20170707152918.23086-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170707152918.23086-1-vsementsov@virtuozzo.com> References: <20170707152918.23086-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v3 06/10] nbd/client: refactor TRACE of NBD_MAGIC 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: vsementsov@virtuozzo.com, stefanha@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We are going to switch from TRACE macro to trace points, this TRACE complicates things, this patch simplifies it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- nbd/client.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/nbd/client.c b/nbd/client.c index b97143fa60..2125321ebd 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -461,15 +461,8 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char = *name, uint16_t *flags, goto fail; } =20 - TRACE("Magic is %c%c%c%c%c%c%c%c", - qemu_isprint(buf[0]) ? buf[0] : '.', - qemu_isprint(buf[1]) ? buf[1] : '.', - qemu_isprint(buf[2]) ? buf[2] : '.', - qemu_isprint(buf[3]) ? buf[3] : '.', - qemu_isprint(buf[4]) ? buf[4] : '.', - qemu_isprint(buf[5]) ? buf[5] : '.', - qemu_isprint(buf[6]) ? buf[6] : '.', - qemu_isprint(buf[7]) ? buf[7] : '.'); + magic =3D ldq_be_p(buf); + TRACE("Magic is 0x%" PRIx64, magic); =20 if (memcmp(buf, "NBDMAGIC", 8) !=3D 0) { error_setg(errp, "Invalid magic received"); --=20 2.11.1