diff options
author | Vladimir Sementsov-Ogievskiy | 2021-09-06 21:06:50 +0200 |
---|---|---|
committer | Vladimir Sementsov-Ogievskiy | 2021-12-21 14:52:19 +0100 |
commit | 9e14491af473e94ea836c70c8a57da68d02e62b8 (patch) | |
tree | 191bbbe4daa965cb3f020d1e3c5ddbd2ded8454a /nbd | |
parent | nbd/client-connection: nbd_co_establish_connection(): return real error (diff) | |
download | qemu-9e14491af473e94ea836c70c8a57da68d02e62b8.tar.gz qemu-9e14491af473e94ea836c70c8a57da68d02e62b8.tar.xz qemu-9e14491af473e94ea836c70c8a57da68d02e62b8.zip |
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.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nbd/client-connection.c b/nbd/client-connection.c index 722998c985..2bda42641d 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; |