|
 |
7711c0 |
From 1ff1deba5e09af78b2fe8095fc0472dfd0051f1c Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Wed, 27 Mar 2019 17:22:22 +0100
|
|
|
7711c0 |
Subject: [PATCH 083/163] nbd/client: More consistent error messages
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190327172308.31077-10-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 85185
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 09/55] nbd/client: More consistent error messages
|
|
|
7711c0 |
Bugzilla: 1691009
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
Consolidate on using decimal (not hex), on outputting the
|
|
|
7711c0 |
option reply name (not just value), and a consistent comma between
|
|
|
7711c0 |
clauses, when the client reports protocol discrepancies from the
|
|
|
7711c0 |
server. While it won't affect normal operation, it makes
|
|
|
7711c0 |
debugging additions easier.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
7711c0 |
Message-Id: <20181215135324.152629-6-eblake@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 6c5c035138218a384a229e7b6b9cf51451621c6a)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
nbd/client.c | 21 ++++++++++++---------
|
|
|
7711c0 |
1 file changed, 12 insertions(+), 9 deletions(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/nbd/client.c b/nbd/client.c
|
|
|
7711c0 |
index 0ad7147..e774147 100644
|
|
|
7711c0 |
--- a/nbd/client.c
|
|
|
7711c0 |
+++ b/nbd/client.c
|
|
|
7711c0 |
@@ -132,8 +132,9 @@ static int nbd_receive_option_reply(QIOChannel *ioc, uint32_t opt,
|
|
|
7711c0 |
return -1;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
if (reply->option != opt) {
|
|
|
7711c0 |
- error_setg(errp, "Unexpected option type %x expected %x",
|
|
|
7711c0 |
- reply->option, opt);
|
|
|
7711c0 |
+ error_setg(errp, "Unexpected option type %u (%s), expected %u (%s)",
|
|
|
7711c0 |
+ reply->option, nbd_opt_lookup(reply->option),
|
|
|
7711c0 |
+ opt, nbd_opt_lookup(opt));
|
|
|
7711c0 |
nbd_send_opt_abort(ioc);
|
|
|
7711c0 |
return -1;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
@@ -267,8 +268,9 @@ static int nbd_receive_list(QIOChannel *ioc, const char *want, bool *match,
|
|
|
7711c0 |
}
|
|
|
7711c0 |
return 0;
|
|
|
7711c0 |
} else if (reply.type != NBD_REP_SERVER) {
|
|
|
7711c0 |
- error_setg(errp, "Unexpected reply type %" PRIx32 " expected %x",
|
|
|
7711c0 |
- reply.type, NBD_REP_SERVER);
|
|
|
7711c0 |
+ error_setg(errp, "Unexpected reply type %u (%s), expected %u (%s)",
|
|
|
7711c0 |
+ reply.type, nbd_rep_lookup(reply.type),
|
|
|
7711c0 |
+ NBD_REP_SERVER, nbd_rep_lookup(NBD_REP_SERVER));
|
|
|
7711c0 |
nbd_send_opt_abort(ioc);
|
|
|
7711c0 |
return -1;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
@@ -380,9 +382,9 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname,
|
|
|
7711c0 |
return 1;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
if (reply.type != NBD_REP_INFO) {
|
|
|
7711c0 |
- error_setg(errp, "unexpected reply type %" PRIu32
|
|
|
7711c0 |
- " (%s), expected %u",
|
|
|
7711c0 |
- reply.type, nbd_rep_lookup(reply.type), NBD_REP_INFO);
|
|
|
7711c0 |
+ error_setg(errp, "unexpected reply type %u (%s), expected %u (%s)",
|
|
|
7711c0 |
+ reply.type, nbd_rep_lookup(reply.type),
|
|
|
7711c0 |
+ NBD_REP_INFO, nbd_rep_lookup(NBD_REP_INFO));
|
|
|
7711c0 |
nbd_send_opt_abort(ioc);
|
|
|
7711c0 |
return -1;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
@@ -706,8 +708,9 @@ static int nbd_negotiate_simple_meta_context(QIOChannel *ioc,
|
|
|
7711c0 |
}
|
|
|
7711c0 |
|
|
|
7711c0 |
if (reply.type != NBD_REP_ACK) {
|
|
|
7711c0 |
- error_setg(errp, "Unexpected reply type %" PRIx32 " expected %x",
|
|
|
7711c0 |
- reply.type, NBD_REP_ACK);
|
|
|
7711c0 |
+ error_setg(errp, "Unexpected reply type %u (%s), expected %u (%s)",
|
|
|
7711c0 |
+ reply.type, nbd_rep_lookup(reply.type),
|
|
|
7711c0 |
+ NBD_REP_ACK, nbd_rep_lookup(NBD_REP_ACK));
|
|
|
7711c0 |
nbd_send_opt_abort(ioc);
|
|
|
7711c0 |
return -1;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|