aboutsummaryrefslogtreecommitdiff
path: root/nbd
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2021-09-06 22:06:50 +0300
committerVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2021-12-21 14:52:19 +0100
commit9e14491af473e94ea836c70c8a57da68d02e62b8 (patch)
tree191bbbe4daa965cb3f020d1e3c5ddbd2ded8454a /nbd
parent169b9a94ed24a40b2bfc8664ecd2e75cd33d0978 (diff)
downloadqemu-9e14491af473e94ea836c70c8a57da68d02e62b8.zip
qemu-9e14491af473e94ea836c70c8a57da68d02e62b8.tar.gz
qemu-9e14491af473e94ea836c70c8a57da68d02e62b8.tar.bz2
nbd/client-connection: improve error message of cancelled attempt
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'nbd')
-rw-r--r--nbd/client-connection.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/nbd/client-connection.c b/nbd/client-connection.c
index 722998c..2bda426 100644
--- a/nbd/client-connection.c
+++ b/nbd/client-connection.c
@@ -351,8 +351,15 @@ nbd_co_establish_connection(NBDClientConnection *conn, NBDExportInfo *info,
if (conn->err) {
error_propagate(errp, error_copy(conn->err));
} else {
- error_setg(errp,
- "Connection attempt cancelled by other operation");
+ /*
+ * The only possible case here is cancelling by open_timer
+ * during nbd_open(). So, the error message is for that case.
+ * If we have more use cases, we can refactor
+ * nbd_co_establish_connection_cancel() to take an additional
+ * parameter cancel_reason, that would be passed than to the
+ * caller of cancelled nbd_co_establish_connection().
+ */
+ error_setg(errp, "Connection attempt cancelled by timeout");
}
return NULL;