summaryrefslogtreecommitdiffstats
path: root/block/trace-events
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy2020-07-27 20:47:47 +0200
committerEric Blake2020-07-28 16:54:43 +0200
commitfa35591b9cb9a7fd0af2d8c2d8848abba30d3c69 (patch)
tree0ecc2ca9d960613a76855d96f19f002b429733be /block/trace-events
parentiotests: Test convert to qcow2 compressed to NBD (diff)
downloadqemu-fa35591b9cb9a7fd0af2d8c2d8848abba30d3c69.tar.gz
qemu-fa35591b9cb9a7fd0af2d8c2d8848abba30d3c69.tar.xz
qemu-fa35591b9cb9a7fd0af2d8c2d8848abba30d3c69.zip
block/nbd: split nbd_establish_connection out of nbd_client_connect
We are going to implement non-blocking version of nbd_establish_connection, which for a while will be used only for nbd_reconnect_attempt, not for nbd_open, so we need to call it separately. Refactor nbd_reconnect_attempt in a way which makes next commit simpler. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20200727184751.15704-2-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/trace-events')
-rw-r--r--block/trace-events4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/trace-events b/block/trace-events
index d3533ca896..9158335061 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -168,8 +168,8 @@ nbd_parse_blockstatus_compliance(const char *err) "ignoring extra data from non-
nbd_structured_read_compliance(const char *type) "server sent non-compliant unaligned read %s chunk"
nbd_read_reply_entry_fail(int ret, const char *err) "ret = %d, err: %s"
nbd_co_request_fail(uint64_t from, uint32_t len, uint64_t handle, uint16_t flags, uint16_t type, const char *name, int ret, const char *err) "Request failed { .from = %" PRIu64", .len = %" PRIu32 ", .handle = %" PRIu64 ", .flags = 0x%" PRIx16 ", .type = %" PRIu16 " (%s) } ret = %d, err: %s"
-nbd_client_connect(const char *export_name) "export '%s'"
-nbd_client_connect_success(const char *export_name) "export '%s'"
+nbd_client_handshake(const char *export_name) "export '%s'"
+nbd_client_handshake_success(const char *export_name) "export '%s'"
# ssh.c
ssh_restart_coroutine(void *co) "co=%p"