[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/11] nbd/client: refactor TRACE of NBD_MAGIC
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 07/11] nbd/client: refactor TRACE of NBD_MAGIC |
Date: |
Mon, 10 Jul 2017 07:14:30 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
nbd/client.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/nbd/client.c b/nbd/client.c
index b97143f..2125321 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;
}
- 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 = ldq_be_p(buf);
+ TRACE("Magic is 0x%" PRIx64, magic);
if (memcmp(buf, "NBDMAGIC", 8) != 0) {
error_setg(errp, "Invalid magic received");
--
2.9.4
- [Qemu-devel] [PULL 00/11] NBD patches, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 01/11] MAINTAINERS: Promote NBD to supported, with new maintainer, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 02/11] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 05/11] nbd/server: add errp to nbd_send_reply(), Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 07/11] nbd/client: refactor TRACE of NBD_MAGIC,
Eric Blake <=
- [Qemu-devel] [PULL 03/11] nbd/server: refactor nbd_negotiate, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 06/11] nbd/common: nbd_tls_handshake: remove extra TRACE, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 08/11] nbd/server: fix TRACE in nbd_negotiate_send_rep_len, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 09/11] nbd/server: rename clientflags var in nbd_negotiate_options, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 10/11] nbd: refactor tracing, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 04/11] nbd/server: use errp instead of LOG, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 11/11] nbd: use generic trace subsystem instead of TRACE macro, Eric Blake, 2017/07/10
- Re: [Qemu-devel] [PULL 00/11] NBD patches, Peter Maydell, 2017/07/10