[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/10] nbd/client: refactor TRACE of NBD_MAGIC
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v3 06/10] nbd/client: refactor TRACE of NBD_MAGIC |
Date: |
Fri, 7 Jul 2017 18:29:14 +0300 |
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>
---
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;
}
- 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.11.1
- [Qemu-devel] [PATCH v3 09/10] nbd: refactor tracing, (continued)
- [Qemu-devel] [PATCH v3 09/10] nbd: refactor tracing, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 05/10] nbd/common: nbd_tls_handshake: remove extra TRACE, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 02/10] nbd/server: refactor nbd_negotiate, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 01/10] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 07/10] nbd/server: fix TRACE in nbd_negotiate_send_rep_len, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 08/10] nbd/server: rename clientflags var in nbd_negotiate_options, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 06/10] nbd/client: refactor TRACE of NBD_MAGIC,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v3 04/10] nbd/server: add errp to nbd_send_reply(), Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 10/10] nbd: use generic trace subsystem instead of TRACE macro, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 03/10] nbd/server: use errp instead of LOG, Vladimir Sementsov-Ogievskiy, 2017/07/07
- Re: [Qemu-devel] [PATCH v3 00/10] nbd refactoring part 2, Paolo Bonzini, 2017/07/07