[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 07/11] nbd/client: refactor TRACE of NBD_MAGIC
From: |
Eric Blake |
Subject: |
[Qemu-block] [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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-block] [PULL 07/11] nbd/client: refactor TRACE of NBD_MAGIC,
Eric Blake <=