aboutsummaryrefslogtreecommitdiff
path: root/nbd/client.c
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2017-10-27 12:40:26 +0200
committerEric Blake <eblake@redhat.com>2017-10-30 21:07:21 +0100
commite7a78d0eff820b56d33be31af1bb49e2948374fd (patch)
tree89887ad46bd17d537a529b25d448271124ac174b /nbd/client.c
parentabf6e752e55b2f5afb48303429dea2db7c3a62de (diff)
downloadqemu-e7a78d0eff820b56d33be31af1bb49e2948374fd.zip
qemu-e7a78d0eff820b56d33be31af1bb49e2948374fd.tar.gz
qemu-e7a78d0eff820b56d33be31af1bb49e2948374fd.tar.bz2
nbd: Include error names in trace messages
NBD errors were originally sent over the wire based on Linux errno values; but not all the world is Linux, and not all platforms share the same values. Since a number isn't very easy to decipher on all platforms, update the trace messages to include the name of NBD errors being sent/received over the wire. Tweak the trace messages to be at the point where we are using the NBD error, not the translation to the host errno values. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20171027104037.8319-2-eblake@redhat.com>
Diffstat (limited to 'nbd/client.c')
-rw-r--r--nbd/client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nbd/client.c b/nbd/client.c
index cd5a2c8..59d7c9d 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -940,6 +940,8 @@ int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)
reply->error = ldl_be_p(buf + 4);
reply->handle = ldq_be_p(buf + 8);
+ trace_nbd_receive_reply(magic, reply->error, nbd_err_lookup(reply->error),
+ reply->handle);
reply->error = nbd_errno_to_system_errno(reply->error);
if (reply->error == ESHUTDOWN) {
@@ -947,7 +949,6 @@ int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)
error_setg(errp, "server shutting down");
return -EINVAL;
}
- trace_nbd_receive_reply(magic, reply->error, reply->handle);
if (magic != NBD_SIMPLE_REPLY_MAGIC) {
error_setg(errp, "invalid magic (got 0x%" PRIx32 ")", magic);