commit 28fb494f9b8827c6087d515e20a3c78baaf443cc
author Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Thu Feb 15 16:51:43 2018 +0300
committer Eric Blake <eblake@redhat.com> Thu Mar 01 14:48:23 2018 -0600
tree 9d434d36f0f9de6fb3c1154a18eef83c2dab27cd
parent 25c146789f533c755923b941262be8072586728c

nbd/client: fix error messages in nbd_handle_reply_err

1. NBD_REP_ERR_INVALID is not only about length, so, make message more
   general

2. hex format is not very good: it's hard to read something like
   "option a (set meta context)", so switch to dec.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <1518702707-7077-6-git-send-email-vsementsov@virtuozzo.com>
[eblake: expand scope of patch: ALL uses of nbd_opt_lookup and
nbd_rep_lookup are now decimal]
Signed-off-by: Eric Blake <eblake@redhat.com>

nbd/server.c

diff --git a/nbd/server.c b/nbd/server.c
index 112e3f6..4990a58 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -806,7 +806,7 @@
 
             default:
                 ret = nbd_opt_drop(client, NBD_REP_ERR_UNSUP, errp,
-                                   "Unsupported option 0x%" PRIx32 " (%s)",
+                                   "Unsupported option %" PRIu32 " (%s)",
                                    option, nbd_opt_lookup(option));
                 break;
             }
@@ -822,7 +822,7 @@
                                                         errp);
 
             default:
-                error_setg(errp, "Unsupported option 0x%" PRIx32 " (%s)",
+                error_setg(errp, "Unsupported option %" PRIu32 " (%s)",
                            option, nbd_opt_lookup(option));
                 return -EINVAL;
             }