[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/6] nbd/client: refactor TRACE of NBD_MAGIC
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v2 5/6] nbd/client: refactor TRACE of NBD_MAGIC |
Date: |
Wed, 21 Jun 2017 18:34:23 +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 | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/nbd/client.c b/nbd/client.c
index b97143fa60..5a4825ebe0 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -426,14 +426,13 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,
return QIO_CHANNEL(tioc);
}
-
int nbd_receive_negotiate(QIOChannel *ioc, const char *name, uint16_t *flags,
QCryptoTLSCreds *tlscreds, const char *hostname,
QIOChannel **outioc,
off_t *size, Error **errp)
{
char buf[256];
- uint64_t magic, s;
+ uint64_t nbd_magic, magic, s;
int rc;
bool zeroes = true;
@@ -461,15 +460,9 @@ 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] : '.');
+ memcpy(&nbd_magic, buf, 8);
+ nbd_magic = be64_to_cpu(nbd_magic);
+ TRACE("Magic is 0x%" PRIx64, nbd_magic);
if (memcmp(buf, "NBDMAGIC", 8) != 0) {
error_setg(errp, "Invalid magic received");
--
2.11.1
- [Qemu-devel] [PATCH v2 0/6] nbd refactoring part 2, Vladimir Sementsov-Ogievskiy, 2017/06/21
- [Qemu-devel] [PATCH v2 5/6] nbd/client: refactor TRACE of NBD_MAGIC,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v2 4/6] nbd/common: nbd_tls_handshake: remove extra TRACE, Vladimir Sementsov-Ogievskiy, 2017/06/21
- [Qemu-devel] [PATCH v2 2/6] nbd/server: use errp instead of LOG, Vladimir Sementsov-Ogievskiy, 2017/06/21
- [Qemu-devel] [PATCH v2 6/6] nbd: use generic trace subsystem instead of TRACE macro, Vladimir Sementsov-Ogievskiy, 2017/06/21
- [Qemu-devel] [PATCH v2 1/6] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Vladimir Sementsov-Ogievskiy, 2017/06/21
- [Qemu-devel] [PATCH v2 3/6] nbd/server: add errp to nbd_send_reply(), Vladimir Sementsov-Ogievskiy, 2017/06/21